On Tue, Feb 05, 2019 at 03:37:01PM -0800, Junio C Hamano wrote: > * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits > - 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. > > Will merge to 'next'. We should pull v6[1] of the patchset before we merge into next. It resolves merge conflicts related to the changed function signature of `append_conflicts_hint`. [1]: https://public-inbox.org/git/cover.1548219737.git.liu.denton@xxxxxxxxx/
