X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;fp=tests%2Ftests%2Fgdr-merge;h=a213385a06de5e44af7a492fbf361d2402bf97fb;hp=666672faa82ac01fbf8ee07f37a26f78dfdb25e5;hb=75da546e42b202e22aafb7241b9819e51b1d6ea7;hpb=14940a67eb1525d69a8dade2777f8cd11200307c

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 666672fa..a213385a 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -40,14 +40,25 @@ t-git-debrebase quick
 git checkout -b other
 t-some-changes other '' -other
 
+echo 'other-conflict' >>debian/zorkmid
+git commit -m 'other-conflict' debian/zorkmid
+
 git checkout master
 t-some-changes us-1 '' -us
 t-git-debrebase new-upstream 2.1
 t-some-changes us-2 '' -us
+echo 'us-conflict' >>debian/zorkmid
+git commit -m 'us-conflict' debian/zorkmid
 t-git-debrebase quick
 
+t-expect-fail E:'Merge conflict in debian/zorkmid' \
 git merge other
 
+perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
+
+git add debian/zorkmid
+git commit --no-edit
+
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase