From 75589220289ca8400388813af66c7219811e0334 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Tue, 11 May 2010 01:17:47 +0800 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge.c b/builtin/merge.c index c043066845..457bb5e48a 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. -- 2.11.4.GIT