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.defaultToUpstream:: 10 If merge is called without any commit argument, merge the upstream 11 branches configured for the current branch by using their last 12 observed values stored in their remote tracking branches. 13 The values of the `branch.<current branch>.merge` that name the 14 branches at the remote named by `branch.<current branch>.remote` 15 are consulted, and then they are mapped via `remote.<remote>.fetch` 16 to their corresponding remote tracking branches, and the tips of 17 these tracking branches are merged. 18 19merge.log:: 20 In addition to branch names, populate the log message with at 21 most the specified number of one-line descriptions from the 22 actual commits that are being merged. Defaults to false, and 23 true is a synonym for 20. 24 25merge.renameLimit:: 26 The number of files to consider when performing rename detection 27 during a merge; if not specified, defaults to the value of 28 diff.renameLimit. 29 30merge.renormalize:: 31 Tell git that canonical representation of files in the 32 repository has changed over time (e.g. earlier commits record 33 text files with CRLF line endings, but recent ones use LF line 34 endings). In such a repository, git can convert the data 35 recorded in commits to a canonical form before performing a 36 merge to reduce unnecessary conflicts. For more information, 37 see section "Merging branches with differing checkin/checkout 38 attributes" in linkgit:gitattributes[5]. 39 40merge.stat:: 41 Whether to print the diffstat between ORIG_HEAD and the merge result 42 at the end of the merge. True by default. 43 44merge.tool:: 45 Controls which merge resolution program is used by 46 linkgit:git-mergetool[1]. Valid built-in values are: "araxis", 47 "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", 48 "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" 49 and "xxdiff". Any other value is treated is custom merge tool 50 and there must be a corresponding mergetool.<tool>.cmd option. 51 52merge.verbosity:: 53 Controls the amount of output shown by the recursive merge 54 strategy. Level 0 outputs nothing except a final error 55 message if conflicts were detected. Level 1 outputs only 56 conflicts, 2 outputs conflicts and file changes. Level 5 and 57 above outputs debugging information. The default is level 2. 58 Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. 59 60merge.<driver>.name:: 61 Defines a human-readable name for a custom low-level 62 merge driver. See linkgit:gitattributes[5] for details. 63 64merge.<driver>.driver:: 65 Defines the command that implements a custom low-level 66 merge driver. See linkgit:gitattributes[5] for details. 67 68merge.<driver>.recursive:: 69 Names a low-level merge driver to be used when 70 performing an internal merge between common ancestors. 71 See linkgit:gitattributes[5] for details.