diff options
Diffstat (limited to 'tests/lib-gdr')
-rw-r--r-- | tests/lib-gdr | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index da119bc..ac4a476 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -203,6 +203,11 @@ t-maintainer-commit-some-changes () { t-git-next-date } +t-nmu-causes-ff-fail () { + t-expect-fail E:'Not.*fast-forward' \ + git merge --ff-only dgit/dgit/sid +} + t-nmu-reconciled-good () { local nmutree=$1 |