Compared to the 3-item v2: 1/4 == 1/3
2/4 is new as per Junio's suggestion: clarify the call-chain leading up to prepare_to_commit() 3/4 == 2/3 with amended subject 4/4 is 3/3 rebased, squash-if removed Michael J Gruber (4): Documentation/git-merge: explain --continue merge: clarify call chain merge: split write_merge_state in two merge: save merge state earlier Documentation/git-merge.txt | 5 ++++- builtin/merge.c | 15 ++++++++++++--- t/t7600-merge.sh | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) -- 2.14.1.426.g4352aa77a5
