diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-09-03 21:28:39 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-09-03 21:28:39 -0700 |
| commit | cc704da52293859135140d783697360b55ea34a5 (patch) | |
| tree | 7ca5bdb2177cb05a798d4ac8d292057a2c3abcf1 /tests/tests/gdr-diverge-nmu-dgit | |
| parent | 29176533eff12cd3e90e3a3ce60e59ec1077b2ac (diff) | |
| parent | 80660b109ae671e5164c6738919f34db06719236 (diff) | |
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
Diffstat (limited to 'tests/tests/gdr-diverge-nmu-dgit')
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu-dgit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index 1d136a9..007c35b 100755 --- a/tests/tests/gdr-diverge-nmu-dgit +++ b/tests/tests/gdr-diverge-nmu-dgit @@ -42,7 +42,7 @@ t-nmu-causes-ff-fail git checkout dgit/dgit/sid # detach -t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \ +t-expect-fail 'E:CONFLICT.*Commit patch queue' \ git rebase master git rebase --skip |