diff options
Diffstat (limited to 'tests/tests/gdr-diverge-nmu-dgit')
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu-dgit | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index f7bf3d5..02fb2f7 100755 --- a/tests/tests/gdr-diverge-nmu-dgit +++ b/tests/tests/gdr-diverge-nmu-dgit @@ -35,8 +35,7 @@ t-maintainer-commit-some-changes t-dgit fetch t-git-next-date -t-expect-fail E:'Not.*fast-forward' \ -git merge --ff-only dgit/dgit/sid +t-nmu-causes-ff-fail : 'rebase nmu onto our branch' |