8 t-tstunt-parsechangelog
9 t-setup-import gdr-convert-gbp-noarchive
13 t-gdr-prep-new-upstream 2.1
19 : ----- prepare LH branch -----
22 t-some-changes other '' -other
24 echo 'other-conflict' >>debian/zorkmid
25 git commit -m 'other-conflict' debian/zorkmid
27 : ----- prepare RH branch -----
30 t-some-changes us-1 '' -us
31 t-git-debrebase new-upstream 2.1
32 t-some-changes us-2 '' -us
33 echo 'us-conflict' >>debian/zorkmid
34 git commit -m 'us-conflict' debian/zorkmid
37 : ----- introduce a vanilla merge -----
39 t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
41 t-expect-fail E:'general two-parent merge' \
44 t_gdr_xopts+=' --experimental-merge-resolution'
46 : ----- expect to be able to merge -----