diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-05-11 01:17:47 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-10 11:57:32 -0700 |
| commit | 75589220289ca8400388813af66c7219811e0334 (patch) | |
| tree | 2822ccdb3d355409d4c6b182599bff0cea3a99f9 /builtin/merge.c | |
| parent | d4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746 (diff) | |
| download | git-75589220289ca8400388813af66c7219811e0334.tar.gz git-75589220289ca8400388813af66c7219811e0334.tar.xz | |
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>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index c04306684..457bb5e48 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. |