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.
10 Whether to include summaries of merged commits in newly created
11 merge commit messages. False by default.
14 The number of files to consider when performing rename detection
15 during a merge; if not specified, defaults to the value of
19 Whether to print the diffstat between ORIG_HEAD and the merge result
20 at the end of the merge. True by default.
23 Controls which merge resolution program is used by
24 linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
25 "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
26 "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
27 "opendiff". Any other value is treated is custom merge tool
28 and there must be a corresponding mergetool.<tool>.cmd option.
31 Controls the amount of output shown by the recursive merge
32 strategy. Level 0 outputs nothing except a final error
33 message if conflicts were detected. Level 1 outputs only
34 conflicts, 2 outputs conflicts and file changes. Level 5 and
35 above outputs debugging information. The default is level 2.
36 Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
39 Defines a human-readable name for a custom low-level
40 merge driver. See linkgit:gitattributes[5] for details.
42 merge.<driver>.driver::
43 Defines the command that implements a custom low-level
44 merge driver. See linkgit:gitattributes[5] for details.
46 merge.<driver>.recursive::
47 Names a low-level merge driver to be used when
48 performing an internal merge between common ancestors.
49 See linkgit:gitattributes[5] for details.