chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu-dgit
diff --git
a/tests/tests/gdr-diverge-nmu-dgit
b/tests/tests/gdr-diverge-nmu-dgit
index f7bf3d51f4469100034c22456c1b76086d5ada35..02fb2f704481763303d55ac89c305ac32c8026cf 100755
(executable)
--- 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'