diff options
Diffstat (limited to 'tests/tests/gdr-merge')
| -rwxr-xr-x | tests/tests/gdr-merge | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index 666672f..a213385 100755 --- a/tests/tests/gdr-merge +++ b/tests/tests/gdr-merge @@ -40,14 +40,25 @@ t-git-debrebase quick git checkout -b other t-some-changes other '' -other +echo 'other-conflict' >>debian/zorkmid +git commit -m 'other-conflict' debian/zorkmid + git checkout master t-some-changes us-1 '' -us t-git-debrebase new-upstream 2.1 t-some-changes us-2 '' -us +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-expect-fail E:'general two-parent merge' \ t-git-debrebase |