From: Tay Ray Chuan <rctay89@gmail.com>
Date: Mon, 10 May 2010 17:17:47 +0000 (+0800)
Subject: merge: update comment
X-Git-Tag: v1.7.2-rc0~60^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=75589220289ca8400388813af66c7219811e0334;p=git.git

merge: update comment

ce9d823 (merge: do not add standard message when message is given with
-m option) changed the behaviour of the code that the comment addressed,
but the comment was not similarly updated.

Fix this.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/merge.c b/builtin/merge.c
index c04306684..457bb5e48 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -981,7 +981,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		/*
 		 * All the rest are the commits being merged;
 		 * prepare the standard merge summary message to
-		 * be appended to the given message.  If remote
+		 * used as the merge message.  If remote
 		 * is invalid we will die later in the common
 		 * codepath so we discard the error in this
 		 * loop.