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.ff:: 20 By default, git does not create an extra merge commit when merging 21 a commit that is a descendant of the current commit. Instead, the 22 tip of the current branch is fast-forwarded. When set to `false`, 23 this variable tells git to create an extra merge commit in such 24 a case (equivalent to giving the `--no-ff` option from the command 25 line). When set to `only`, only such fast-forward merges are 26 allowed (equivalent to giving the `--ff-only` option from the 27 command line). 28 29merge.log:: 30 In addition to branch names, populate the log message with at 31 most the specified number of one-line descriptions from the 32 actual commits that are being merged. Defaults to false, and 33 true is a synonym for 20. 34 35merge.renameLimit:: 36 The number of files to consider when performing rename detection 37 during a merge; if not specified, defaults to the value of 38 diff.renameLimit. 39 40merge.renormalize:: 41 Tell git that canonical representation of files in the 42 repository has changed over time (e.g. earlier commits record 43 text files with CRLF line endings, but recent ones use LF line 44 endings). In such a repository, git can convert the data 45 recorded in commits to a canonical form before performing a 46 merge to reduce unnecessary conflicts. For more information, 47 see section "Merging branches with differing checkin/checkout 48 attributes" in linkgit:gitattributes[5]. 49 50merge.stat:: 51 Whether to print the diffstat between ORIG_HEAD and the merge result 52 at the end of the merge. True by default. 53 54merge.tool:: 55 Controls which merge resolution program is used by 56 linkgit:git-mergetool[1]. Valid built-in values are: "araxis", 57 "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", 58 "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" 59 and "xxdiff". Any other value is treated is custom merge tool 60 and there must be a corresponding mergetool.<tool>.cmd option. 61 62merge.verbosity:: 63 Controls the amount of output shown by the recursive merge 64 strategy. Level 0 outputs nothing except a final error 65 message if conflicts were detected. Level 1 outputs only 66 conflicts, 2 outputs conflicts and file changes. Level 5 and 67 above outputs debugging information. The default is level 2. 68 Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. 69 70merge.<driver>.name:: 71 Defines a human-readable name for a custom low-level 72 merge driver. See linkgit:gitattributes[5] for details. 73 74merge.<driver>.driver:: 75 Defines the command that implements a custom low-level 76 merge driver. See linkgit:gitattributes[5] for details. 77 78merge.<driver>.recursive:: 79 Names a low-level merge driver to be used when 80 performing an internal merge between common ancestors. 81 See linkgit:gitattributes[5] for details.