Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
correct usage help string for git-hash-object
[gitweb.git]
/
t
/
t1200-tutorial.sh
diff --git
a/t/t1200-tutorial.sh
b/t/t1200-tutorial.sh
index dcb3108c290813dae178394011bb2b44f2f7ca9e..09a8199335cbdf96f8aba75d47a321f0cfb828d9 100755
(executable)
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-102,7
+102,7
@@
echo "Lots of fun" >>example
git commit -m 'Some fun.' -i hello example
test_expect_success 'git resolve now fails' '
-
!
git merge -m "Merge work in mybranch" mybranch
+
test_must_fail
git merge -m "Merge work in mybranch" mybranch
'
cat > hello << EOF