1merge.stat:: 2 Whether to print the diffstat berween ORIG_HEAD and merge result 3 at the end of the merge. True by default. 4 5merge.log:: 6 Whether to include summaries of merged commits in newly created 7 merge commit messages. False by default. 8 9merge.tool:: 10 Controls which merge resolution program is used by 11 linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", 12 "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and 13 "opendiff". Any other value is treated is custom merge tool 14 and there must be a corresponing mergetool.<tool>.cmd option. 15 16merge.verbosity:: 17 Controls the amount of output shown by the recursive merge 18 strategy. Level 0 outputs nothing except a final error 19 message if conflicts were detected. Level 1 outputs only 20 conflicts, 2 outputs conflicts and file changes. Level 5 and 21 above outputs debugging information. The default is level 2. 22 Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. 23 24merge.<driver>.name:: 25 Defines a human readable name for a custom low-level 26 merge driver. See linkgit:gitattributes[5] for details. 27 28merge.<driver>.driver:: 29 Defines the command that implements a custom low-level 30 merge driver. See linkgit:gitattributes[5] for details. 31 32merge.<driver>.recursive:: 33 Names a low-level merge driver to be used when 34 performing an internal merge between common ancestors. 35 See linkgit:gitattributes[5] for details.