summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-21 07:49:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 07:49:27 (GMT)
commit4c734803cbd4fac667ba518460c2c0d8725ae3f7 (patch)
tree6045c768063b1b8224e16b0544afc3d1819c4d65 /Documentation/gitattributes.txt
parent2eb41d7200d15f4b12ad6497a99786ec5357217d (diff)
downloadgit-4c734803cbd4fac667ba518460c2c0d8725ae3f7.zip
git-4c734803cbd4fac667ba518460c2c0d8725ae3f7.tar.gz
git-4c734803cbd4fac667ba518460c2c0d8725ae3f7.tar.bz2
conflict-marker-size: add test and docs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 814714c..b396a87 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -525,6 +525,23 @@ When left unspecified, the driver itself is used for both
internal merge and the final merge.
+`conflict-marker-size`
+^^^^^^^^^^^^^^^^^^^^^^
+
+This attribute controls the length of conflict markers left in
+the work tree file during a conflicted merge. Only setting to
+the value to a positive integer has any meaningful effect.
+
+For example, this line in `.gitattributes` can be used to tell the merge
+machinery to leave much longer (instead of the usual 7-character-long)
+conflict markers when merging the file `Documentation/git-merge.txt`
+results in a conflict.
+
+------------------------
+Documentation/git-merge.txt conflict-marker-size=32
+------------------------
+
+
Checking whitespace errors
~~~~~~~~~~~~~~~~~~~~~~~~~~