Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t7501: add test of "commit --dry-run --short"
[gitweb.git]
/
t
/
t3031-merge-criscross.sh
diff --git
a/t/t3031-merge-criscross.sh
b/t/t3031-merge-criscross.sh
index e59b0a32d67ec86074059eee7a64c4b7bae6c145..3824756a02ec31c228e2eeda92fc13a33b1e4b75 100755
(executable)
--- a/
t/t3031-merge-criscross.sh
+++ b/
t/t3031-merge-criscross.sh
@@
-88,7
+88,7
@@
test_expect_success 'setup repo with criss-cross history' '
git branch G
'
-test_expect_success 'recursive merge between F and G
, causes
segfault' '
+test_expect_success 'recursive merge between F and G
does not cause
segfault' '
git merge F
'