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=07ded5a3172bef6862d924b16ab4c76d087e4968;hb=9fe91f98a08e948bf3e282cd17f7c2637669a216;hpb=a79b9f2941ebacde9cdc067d042cfea1a68a6844

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 07ded5a3..60146913 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -8,25 +8,6 @@ t-dependencies NO-DGIT GDR
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-: 'set up so t-git-debrebase runs gdr via git'
-
-case "$DGIT_GITDEBREBASE_TEST" in
-''|git-debrebase)	;;
-*)
-	t-tstunt
-	st=$tmp/tstunt/git-debrebase
-	export DGIT_GITDEBREBASE_TEST_REAL="$DGIT_GITDEBREBASE_TEST"
-	cat <<'END' >$st
-#!/bin/sh
-set -x
-exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
-END
-	chmod +x $st
-	;;
-esac
-
-DGIT_GITDEBREBASE_TEST='git debrebase'
-
 : 'do a simple test'
 
 cd $p
@@ -51,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