projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ebd5fe1
)
git-remote-mediawiki: fix incorrect test usage in test
author
Matthieu Moy
<Matthieu.Moy@imag.fr>
Tue, 17 Jul 2012 14:05:59 +0000
(16:05 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 17 Jul 2012 18:51:45 +0000
(11:51 -0700)
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/mw-to-git/t/push-pull-tests.sh
patch
|
blob
|
history
diff --git
a/contrib/mw-to-git/t/push-pull-tests.sh
b/contrib/mw-to-git/t/push-pull-tests.sh
index 6692a0f40fd99a5b3a8adbb98111e3ea633c9943..9da2dc5ff03699305613612225aba34bd5ff1611 100644
(file)
--- 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' '