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

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc parse-options.h
Simple merge

diff --cc sequencer.c
index 5da5949962dcca01d535eb2d2fb256342d7797a2,03756485791e83f9eb4288326ec2afbf8cc1ac00..4407a3f97858acdf47add8e8848cba12daf1de6d
--- 1/sequencer.c
--- 2/sequencer.c
+++ b/sequencer.c
@@@ -2727,14 -2791,18 +2783,19 @@@ static int save_opts(struct replay_opt
                int i;
                for (i = 0; i < opts->xopts_nr; i++)
                        res |= git_config_set_multivar_in_file_gently(opts_file,
 -                                                      "options.strategy-option",
 -                                                      opts->xopts[i], "^$", 0);
 +                                      "options.strategy-option",
 +                                      opts->xopts[i], "^$", 0);
        }
        if (opts->allow_rerere_auto)
 -              res |= git_config_set_in_file_gently(opts_file, "options.allow-rerere-auto",
 -                                                   opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
 -                                                   "true" : "false");
 +              res |= git_config_set_in_file_gently(opts_file,
 +                              "options.allow-rerere-auto",
 +                              opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
 +                              "true" : "false");
+ 
+       if (opts->explicit_cleanup)
+               res |= git_config_set_in_file_gently(opts_file,
+                               "options.default-msg-cleanup",
+                               describe_cleanup_mode(opts->default_msg_cleanup));
        return res;
  }
  

diff --cc sequencer.h
Simple merge

diff --cc t/t3507-cherry-pick-conflict.sh
Simple merge