tree 841a4389aea1aef57d9278bec5f966de5bb1ef7e
parent f757794d9dbd1152c0a557d3a07617ac2fa5bc09
parent 1a2b985fb375e7ce14932bfc59365024af2fb6ab
author Junio C Hamano <gitster@pobox.com> 1557329844 +0900
committer Junio C Hamano <gitster@pobox.com> 1557329844 +0900

Merge branch 'dl/merge-cleanup-scissors-fix'

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.

* dl/merge-cleanup-scissors-fix:
  cherry-pick/revert: add scissors line on merge conflict
  sequencer.c: save and restore cleanup mode
  merge: add scissors line on merge conflict
  merge: cleanup messages like commit
  parse-options.h: extract common --cleanup option
  commit: extract cleanup_mode functions to sequencer
  t7502: clean up style
  t7604: clean up style
  t3507: clean up style
  t7600: clean up style