Skip to content

Commit

Permalink
merge: update comment
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tay Ray Chuan authored and Junio C Hamano committed May 10, 2010
1 parent d4e6c4b commit 7558922
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 7558922

Please sign in to comment.