autoimport=
. tests/lib
-t-dependencies NO-DGIT GDR
+t-dependencies NO-DGIT GDR quilt
t-tstunt-parsechangelog
+t-tstunt debchange
t-setup-import gdr-convert-gbp-noarchive
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
wreckage-before () {
junkref=refs/debrebase/wreckage/junk
: ----- make the merge -----
-git merge -s ours other
+git merge --no-edit -s ours other
# we have to do a little dance to make this not a pseudomerge
t-git-next-date