git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d4e6c4b)
merge: update comment
authorTay Ray Chuan <redacted>
Mon, 10 May 2010 17:17:47 +0000 (01:17 +0800)
committerJunio C Hamano <redacted>
Mon, 10 May 2010 18:57:32 +0000 (11:57 -0700)
commit75589220289ca8400388813af66c7219811e0334
tree2822ccdb3d355409d4c6b182599bff0cea3a99f9tree | snapshot
parentd4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
git clone https://git.99rst.org/PROJECT