mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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>
This commit is contained in:
parent
d4e6c4bdc3
commit
7558922028
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue