summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46dc941)
raw | patch | inline | side by side (parent: 46dc941)
author | Junio C Hamano <junkio@cox.net> | |
Sat, 4 Feb 2006 03:41:33 +0000 (19:41 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 4 Feb 2006 03:41:33 +0000 (19:41 -0800) |
Otherwise it would go though shell expansion...
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh | patch | blob | history |
diff --git a/git-merge.sh b/git-merge.sh
index 92e5a65cae6ebe8d9f9eef71277240e3fbe72315..8c0a92c147f6e32a8870f24bd007204bcbc01064 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
-echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
if test "$merge_was_ok" = t
then