From: Tay Ray Chuan Date: Mon, 10 May 2010 17:17:47 GMT Subject: [PATCH 3/8] merge: update comment Message-ID: <1273511872-4924-4-git-send-email-rctay89@gmail.com> In-Reply-To: <1273511872-4924-1-git-send-email-rctay89@gmail.com> 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 --- builtin/merge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 37d414b..c2691e8 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -990,7 +990,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. -- 1.7.1.189.g07419