diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 16:51:54 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 17:05:56 +0100 |
commit | 9fe91f98a08e948bf3e282cd17f7c2637669a216 (patch) | |
tree | 6cbfb60c858ef71318d39a3933c7d5f029f7ed51 /tests/tests | |
parent | 79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd (diff) |
git-debrebase: merge: test: Introduce t-merge-conflicted-*
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-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 |