| commit | 75589220289ca8400388813af66c7219811e0334 | |
| author | Tay Ray Chuan <rctay89@gmail.com> | |
| Mon, 10 May 2010 17:17:47 +0000 (11 01:17 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 May 2010 18:57:32 +0000 (10 11:57 -0700) | ||
| tree | 2822ccdb3d355409d4c6b182599bff0cea3a99f9 | treesnapshot (tar.gz zip) |
| parent | d4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746 | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory |