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
diff --git
a/tests/tests/gdr-diverge-nmu
b/tests/tests/gdr-diverge-nmu
index e647f80a0ac8bec16d36df2f6a20a9f56456fe1a..8f0b9cb0135780a9de29d4457f0636c613140a1a 100755
(executable)
--- a/
tests/tests/gdr-diverge-nmu
+++ b/
tests/tests/gdr-diverge-nmu
@@
-31,8
+31,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
: 'ad hocery'