X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=60146913f93e6d84d26e4d3590145c29584ecd39;hp=b1a215a4890e8241e67693c8a018a10592974729;hb=9fe91f98a08e948bf3e282cd17f7c2637669a216;hpb=79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index b1a215a4..60146913 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -32,13 +32,7 @@ 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-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase