1merge.conflictstyle:: 2 Specify the style in which conflicted hunks are written out to 3 working tree files upon merge. The default is "merge", which 4 shows a `<<<<<<<` conflict marker, changes made by one side, 5 a `=======` marker, changes made by the other side, and then 6 a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` 7 marker and the original text before the `=======` marker. 8 9merge.log:: 10 In addition to branch names, populate the log message with at 11 most the specified number of one-line descriptions from the 12 actual commits that are being merged. Defaults to false, and 13 true is a synoym for 20. 14 15merge.renameLimit:: 16 The number of files to consider when performing rename detection 17 during a merge; if not specified, defaults to the value of 18 diff.renameLimit. 19 20merge.stat:: 21 Whether to print the diffstat between ORIG_HEAD and the merge result 22 at the end of the merge. True by default. 23 24merge.tool:: 25 Controls which merge resolution program is used by 26 linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", 27 "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", 28 "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and 29 "opendiff". Any other value is treated is custom merge tool 30 and there must be a corresponding mergetool.<tool>.cmd option. 31 32merge.verbosity:: 33 Controls the amount of output shown by the recursive merge 34 strategy. Level 0 outputs nothing except a final error 35 message if conflicts were detected. Level 1 outputs only 36 conflicts, 2 outputs conflicts and file changes. Level 5 and 37 above outputs debugging information. The default is level 2. 38 Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. 39 40merge.<driver>.name:: 41 Defines a human-readable name for a custom low-level 42 merge driver. See linkgit:gitattributes[5] for details. 43 44merge.<driver>.driver:: 45 Defines the command that implements a custom low-level 46 merge driver. See linkgit:gitattributes[5] for details. 47 48merge.<driver>.recursive:: 49 Names a low-level merge driver to be used when 50 performing an internal merge between common ancestors. 51 See linkgit:gitattributes[5] for details.