Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
builtin/merge.c: reduce parents early
[gitweb.git]
/
t
/
t7603-merge-reduce-heads.sh
diff --git
a/t/t7603-merge-reduce-heads.sh
b/t/t7603-merge-reduce-heads.sh
index f2934e8c25e71f50503aeccdb6cfd5696c3882f3..a3b08a6420f7576e2208a9350a6f129972e57c23 100755
(executable)
--- a/
t/t7603-merge-reduce-heads.sh
+++ b/
t/t7603-merge-reduce-heads.sh
@@
-119,7
+119,7
@@
test_expect_success 'fast-forward to redundant refs' '
git merge c4 c5
'
-test_expect_
failure
'verify merge result' '
+test_expect_
success
'verify merge result' '
test $(git rev-parse HEAD) = $(git rev-parse c5)
'