X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6026-merge-attr.sh;h=5e439972bea358f700ded4266df31f7dc4514800;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=1ba0a252230a283a6bb2463d98537aab1eaf4fb8;hpb=35da43e9bb4a5d7542c2ee27e0a3557ac921e3ab;p=git.git

diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 1ba0a2522..5e439972b 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -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