aboutsummaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 23:49:27 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 23:49:27 -0800
commit4c734803cbd4fac667ba518460c2c0d8725ae3f7 (patch)
tree6045c768063b1b8224e16b0544afc3d1819c4d65 /t/t6026-merge-attr.sh
parent2eb41d7200d15f4b12ad6497a99786ec5357217d (diff)
downloadgit-4c734803cbd4fac667ba518460c2c0d8725ae3f7.tar.gz
git-4c734803cbd4fac667ba518460c2c0d8725ae3f7.tar.xz
conflict-marker-size: add test and docs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6026-merge-attr.sh')
-rwxr-xr-xt/t6026-merge-attr.sh12
1 files changed, 12 insertions, 0 deletions
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