Skip to content

Commit 7558922

Browse files
rctaygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d4e6c4b commit 7558922

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
981981
/*
982982
* All the rest are the commits being merged;
983983
* prepare the standard merge summary message to
984-
* be appended to the given message. If remote
984+
* used as the merge message. If remote
985985
* is invalid we will die later in the common
986986
* codepath so we discard the error in this
987987
* loop.

0 commit comments

Comments
 (0)