Denton Liu <liu.denton@xxxxxxxxx> writes: > On Tue, Jan 29, 2019 at 02:15:36PM -0800, Junio C Hamano wrote: >> * dl/merge-cleanup-scissors-fix (2019-01-27) 5 commits >> - init docs: correct a punctuation typo >> - merge: add scissors line on merge conflict >> - merge: cleanup messages like commit >> - t7600: clean up 'merge --squash c3 with c7' test >> - commit: extract cleanup_mode functions to sequencer >> >> The list of conflicted paths shown in the editor while concluding a >> conflicted merge was shown above the scissors line when the >> clean-up mode is set to "scissors", even though it was commented >> out just like the list of updated paths and other information to >> help the user explain the merge better. >> >> Comments? > > Not a code review comment but I believe that you mistakenly included the > "init docs" patch in the branch. That commit wasn't part of my patchset. Thank you, thank you, thank you, for saving me from an embarrassment. Eh, now I am already embarrassed, but at least we won't see the embarrassment cast in stone on 'next' and 'master' ;-)
