Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
add chdir-notify API
[gitweb.git]
/
t
/
t6200-fmt-merge-msg.sh
diff --git
a/t/t6200-fmt-merge-msg.sh
b/t/t6200-fmt-merge-msg.sh
index 2e2fb0e9572f3d570311470aebf47da37974b8f8..a54a52aaa4e680bdbc97750c4ae4855a45dcdb80 100755
(executable)
--- a/
t/t6200-fmt-merge-msg.sh
+++ b/
t/t6200-fmt-merge-msg.sh
@@
-512,7
+512,7
@@
test_expect_success 'merge-msg with "merging" an annotated tag' '
test_when_finished "git reset --hard" &&
annote=$(git rev-parse annote) &&
- git merge --no-commit $annote &&
+ git merge --no-commit
--no-ff
$annote &&
{
cat <<-EOF
Merge tag '\''$annote'\''