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>
Tay Ray Chuan committed
May 11, 2010 at 01:17 UTC
75589220289ca8400388813af66c7219811e0334
1 file changed
+1
-1
builtin/merge.c
+1
-1
@@ -981,7 +981,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
981
/*
982
* All the rest are the commits being merged;
983
* prepare the standard merge summary message to
984
- * be appended to the given message. If remote
984
+ * used as the merge message. If remote
985
* is invalid we will die later in the common
986
* codepath so we discard the error in this
987
* loop.