summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git/t
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2012-07-17 14:05:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-17 18:51:45 (GMT)
commitfa316e090a58421c7caf50eefa58f6cb30c6df89 (patch)
treefd93a741b7deba01efd584bac46a30fbc543df81 /contrib/mw-to-git/t
parentebd5fe1c15b8e576042017d6b07b7e0ed96eaf66 (diff)
downloadgit-fa316e090a58421c7caf50eefa58f6cb30c6df89.zip
git-fa316e090a58421c7caf50eefa58f6cb30c6df89.tar.gz
git-fa316e090a58421c7caf50eefa58f6cb30c6df89.tar.bz2
git-remote-mediawiki: fix incorrect test usage in test
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/mw-to-git/t')
-rw-r--r--contrib/mw-to-git/t/push-pull-tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/mw-to-git/t/push-pull-tests.sh b/contrib/mw-to-git/t/push-pull-tests.sh
index 6692a0f..9da2dc5 100644
--- a/contrib/mw-to-git/t/push-pull-tests.sh
+++ b/contrib/mw-to-git/t/push-pull-tests.sh
@@ -104,7 +104,7 @@ test_push_pull () {
git push
) &&
- test ! wiki_page_exist Foo
+ test_must_fail wiki_page_exist Foo
'
test_expect_success 'Merge conflict expected and solving it' '