Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'fc/remote-hg'
[gitweb.git]
/
contrib
/
mw-to-git
/
t
/
push-pull-tests.sh
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' '