Andrew's git / gitweb.git / blobdiff
?
Merge branch 'jk/merge-quiet'
[gitweb.git] / Documentation / merge-config.txt
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index d78d6d854e5fa0a2d4f030d821984f3e6827b9c1..8a0e52f8ee64564ba1dcac63fc91cdef075996a7 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,4 +1,4 @@
-merge.conflictstyle::
+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,