summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorLibravatar Tay Ray Chuan <rctay89@gmail.com>2010-05-11 01:17:47 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-10 11:57:32 -0700
commit75589220289ca8400388813af66c7219811e0334 (patch)
tree2822ccdb3d355409d4c6b182599bff0cea3a99f9 /attr.c
parentt7604-merge-custom-message: show that --log doesn't append to -m (diff)
downloadtgif-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 'attr.c')
0 files changed, 0 insertions, 0 deletions