autoimport=
. tests/lib
-t-dependencies NO-DGIT GDR
+t-dependencies GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
t-expect-fail E:'general two-parent merge' \
t-git-debrebase
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
: ----- expect to be able to merge -----
t-git-debrebase
t-gdr-good laundered
+t-dgit quilt-fixup
+t-gdr-made-patches
+
t-ok