6 t-dependencies NO-DGIT GDR
8 t-tstunt-parsechangelog
9 t-setup-import gdr-convert-gbp-noarchive
15 t-gdr-prep-new-upstream 2.1
22 t-some-changes other '' -other
24 echo 'other-conflict' >>debian/zorkmid
25 git commit -m 'other-conflict' debian/zorkmid
28 t-some-changes us-1 '' -us
29 t-git-debrebase new-upstream 2.1
30 t-some-changes us-2 '' -us
31 echo 'us-conflict' >>debian/zorkmid
32 git commit -m 'us-conflict' debian/zorkmid
35 t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
37 t-expect-fail E:'general two-parent merge' \
40 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1