Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/submodule-parallel-fetch'
[gitweb.git]
/
t
/
t7600-merge.sh
diff --git
a/t/t7600-merge.sh
b/t/t7600-merge.sh
index ede496c76b3a1cd4e8d3bb7a0235b2bd1094df7a..302e23826341bce6c3797330b5f2996877dc5baf 100755
(executable)
--- a/
t/t7600-merge.sh
+++ b/
t/t7600-merge.sh
@@
-133,7
+133,7
@@
test_expect_success 'setup' '
test_tick &&
git commit -m "commit 3" &&
git tag c3 &&
- c3=$(git rev-parse HEAD)
+ c3=$(git rev-parse HEAD)
&&
git reset --hard "$c0" &&
create_merge_msgs
'