Documentation/merge-config.txt

   1 merge.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 `<<<<<<<` conflict marker, change made by one side,
   5         `=======` marker, change made by the other side, and then
   6         `>>>>>>>` marker.  An alternate style, "diff3", adds `|||||||`
   7         marker and the original text before `=======` marker.
   8
   9 merge.log::
  10         Whether to include summaries of merged commits in newly created
  11         merge commit messages. False by default.
  12
  13 merge.renameLimit::
  14         The number of files to consider when performing rename detection
  15         during a merge; if not specified, defaults to the value of
  16         diff.renameLimit.
  17
  18 merge.stat::
  19         Whether to print the diffstat between ORIG_HEAD and the merge result
  20         at the end of the merge.  True by default.
  21
  22 merge.tool::
  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", and
  26         "opendiff".  Any other value is treated is custom merge tool
  27         and there must be a corresponding mergetool.<tool>.cmd option.
  28
  29 merge.verbosity::
  30         Controls the amount of output shown by the recursive merge
  31         strategy.  Level 0 outputs nothing except a final error
  32         message if conflicts were detected. Level 1 outputs only
  33         conflicts, 2 outputs conflicts and file changes.  Level 5 and
  34         above outputs debugging information.  The default is level 2.
  35         Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
  36
  37 merge.<driver>.name::
  38         Defines a human readable name for a custom low-level
  39         merge driver.  See linkgit:gitattributes[5] for details.
  40
  41 merge.<driver>.driver::
  42         Defines the command that implements a custom low-level
  43         merge driver.  See linkgit:gitattributes[5] for details.
  44
  45 merge.<driver>.recursive::
  46         Names a low-level merge driver to be used when
  47         performing an internal merge between common ancestors.
  48         See linkgit:gitattributes[5] for details.