Permalink
Browse files

conflict-marker-size: add test and docs

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
1 parent 2eb41d7 commit 4c734803cbd4fac667ba518460c2c0d8725ae3f7 @gitster gitster committed Jan 21, 2010
Showing with 29 additions and 0 deletions.
  1. +17 −0 Documentation/gitattributes.txt
  2. +12 −0 t/t6026-merge-attr.sh
@@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~
View
@@ -70,6 +70,18 @@ test_expect_success 'check merge result in working tree' '
'
+test_expect_success 'retry the merge with longer context' '
+ echo text conflict-marker-size=32 >>.gitattributes &&
+ git checkout -m text &&
+ sed -ne "/^\([<=>]\)\1\1\1*/{
+ s/ .*$//
+ p
+ }" >actual text &&
+ grep ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" actual &&
+ grep "================================" actual &&
+ grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual
+'
+
cat >./custom-merge <<\EOF
#!/bin/sh

0 comments on commit 4c73480

Please sign in to comment.