gitweb: link to patch(es) view in commit(diff) and (short)log view

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e061313974a4f8fdb9333608902c7ef653f..86d5b26ab2c67940727423fb119d0f446d734db9 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 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 `<<<<<<<` conflict marker, change made by one side,
+       `=======` marker, change made by the other side, and then
+       `>>>>>>>` marker.  An alternate style, "diff3", adds `|||||||`
+       marker and the original text before `=======` marker.
 
 merge.log::
        Whether to include summaries of merged commits in newly created
@@ -11,6 +15,10 @@ 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",