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
-t-some-changes after
-# xxx ^ commenting out this line produces an internal error
+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
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
t-git-debrebase
+t-gdr-good laundered
+t-git-debrebase
+t-gdr-good laundered
+t-git-debrebase scrap
-# xxx want to check that we DTRT if we start out unstitched -
-# xxx should consider our ffq-prev as a parent
-# xxx or should we ? it's not a parent of the merge is it ?
-# xxx => user should prefer to make merges when stitched ?
-# xxx think about this later
-
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-some-changes after
+t-git-debrebase
+t-gdr-good laundered
t-ok