git-debrebase: merge: test suite: test avoiding re-merge of debian/

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 666672faa82ac01fbf8ee07f37a26f78dfdb25e5..a213385a06de5e44af7a492fbf361d2402bf97fb 100755 (executable)
--- 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