merge: update comment
authorTay Ray Chuan <rctay89@gmail.com>
Mon, 10 May 2010 17:17:47 +0000 (01:17 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 May 2010 18:57:32 +0000 (11:57 -0700)
commit7558922...289ca8400388813af66c7219811e0334
tree2822ccd...3d355409d4c6b182599bff0cea3a99f9copy hash to clipboard (tree)
parentd4e6c4b...c3e065f738b0c2fc47d9fe9c3778d746copy hash to clipboard (diff)
builtin/merge.c