Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cc/maint-bisect-paths'
[gitweb.git]
/
t
/
t9150-svk-mergetickets.sh
diff --git
a/t/t9150-svk-mergetickets.sh
b/t/t9150-svk-mergetickets.sh
index dd0c2bad24db26abdab7a91acee109978421ea3e..53581425c4b5cd8e7b35b41605511d52d005e8d6 100755
(executable)
--- a/
t/t9150-svk-mergetickets.sh
+++ b/
t/t9150-svk-mergetickets.sh
@@
-18,7
+18,7
@@
test_expect_success 'load svk depot' "
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
test_expect_success 'svk merges were represented coming in' "
- [ `git
-
cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
+ [ `git
cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
"
test_done