git-debrebase: merge: test: Introduce t-merge-conflicted-*

[dgit.git] / tests / tests / gdr-merge

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index b1a215a4890e8241e67693c8a018a10592974729..60146913f93e6d84d26e4d3590145c29584ecd39 100755 (executable)
--- 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