utf8.c: remove print_wrapped_text()

[git.git] / Documentation / merge-config.txt

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index c735788b0f1c8efb0b250d4810be420be6c62f89..a403155052299dd0aaafd6bdfe0fec92d0d0ac7c 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,6 +1,10 @@
-merge.stat::
-       Whether to print the diffstat between ORIG_HEAD and the merge result
-       at the end of the merge.  True by default.
+merge.conflictstyle::
+       Specify the style in which conflicted hunks are written out to
+       working tree files upon merge.  The default is "merge", which
+       shows a `<<<<<<<` conflict marker, changes made by one side,
+       a `=======` marker, changes made by the other side, and then
+       a `>>>>>>>` marker.  An alternate style, "diff3", adds a `|||||||`
+       marker and the original text before the `=======` marker.
 
 merge.log::
        Whether to include summaries of merged commits in newly created
@@ -11,10 +15,15 @@ merge.renameLimit::
        during a merge; if not specified, defaults to the value of
        diff.renameLimit.
 
+merge.stat::
+       Whether to print the diffstat between ORIG_HEAD and the merge result
+       at the end of the merge.  True by default.
+
 merge.tool::
        Controls which merge resolution program is used by
        linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",
-       "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
+       "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
+       "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
        "opendiff".  Any other value is treated is custom merge tool
        and there must be a corresponding mergetool.<tool>.cmd option.
 
@@ -24,10 +33,10 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
-       Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
+       Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
 
 merge.<driver>.name::
-       Defines a human readable name for a custom low-level
+       Defines a human-readable name for a custom low-level
        merge driver.  See linkgit:gitattributes[5] for details.
 
 merge.<driver>.driver::