From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:24 +0000 (+0900)
Subject: Merge branch 'dl/merge-cleanup-scissors-fix'
X-Git-Tag: v2.22.0-rc0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b877cb4a7ec2fafd03b6a3a70c26370744a32c1b;p=thirdparty%2Fgit.git

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
---

b877cb4a7ec2fafd03b6a3a70c26370744a32c1b
diff --cc sequencer.c
index 5da5949962,0375648579..4407a3f978
--- a/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;
  }