Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
ref_transaction_commit(): fix atomicity and avoid fd exhaustion
[gitweb.git]
/
t
/
t6028-merge-up-to-date.sh
diff --git
a/t/t6028-merge-up-to-date.sh
b/t/t6028-merge-up-to-date.sh
index c518e9c30ccbb12c504d25aa965f8941a3989d8d..7763c1ba98080d5d1d68e1009fb70f6c80cf479a 100755
(executable)
--- a/
t/t6028-merge-up-to-date.sh
+++ b/
t/t6028-merge-up-to-date.sh
@@
-83,7
+83,7
@@
test_expect_success 'merge fast-forward octopus' '
git reset --hard c0 &&
test_tick &&
- git merge c1 c2
+ git merge c1 c2
&&
expect=$(git rev-parse c2) &&
current=$(git rev-parse HEAD) &&
test "$expect" = "$current"