diff options
Diffstat (limited to 'tests/tests/gdr-merge')
| -rwxr-xr-x | tests/tests/gdr-merge | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index b1a215a..6014691 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 |