Merge tag 'debian/6.11' into stretch-bpo

dgit release 6.11 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sun 26 Aug 2018 01:58:34 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

1 files changed, 65 insertions, 0 deletions

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
new file mode 100755
index 0000000..78b79e9
--- /dev/null
+++ b/tests/tests/gdr-merge
@@ -0,0 +1,65 @@
+#!/bin/bash
+set -e
+autoimport=
+. tests/lib
+
+t-dependencies GDR
+
+t-tstunt-parsechangelog
+t-setup-import gdr-convert-gbp-noarchive
+
+cd $p
+
+t-gdr-prep-new-upstream 2.1
+git tag v2.1 upstream
+
+t-some-changes before
+t-git-debrebase quick
+
+: ----- prepare LH branch -----
+
+git checkout -b other
+t-some-changes other '' -other
+
+echo 'other-conflict' >>debian/zorkmid
+git commit -m 'other-conflict' debian/zorkmid
+
+: ----- prepare RH branch -----
+
+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
+
+: ----- introduce a vanilla merge -----
+
+t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
+
+t-expect-fail E:'general two-parent merge' \
+t-git-debrebase
+
+t_gdr_xopts+=' --experimental-merge-resolution'
+
+: ----- expect to be able to merge -----
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
+t-git-debrebase
+t-ref-head
+
+t-git-debrebase scrap
+
+t-some-changes after
+t-git-debrebase
+t-gdr-good laundered
+
+t-dgit quilt-fixup
+t-gdr-made-patches
+
+t-ok