Fix merge name generation in "merge in C"
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2008 08:12:19 +0000 (01:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2008 08:13:26 +0000 (01:13 -0700)
commit9b6bf4d...75e216db9240907940e9f6c619877735
tree8e185b5...51fe27386ba990d8512cfa4cdceef4aacopy hash to clipboard (tree)
parent81b237d...db946b4196225712a37639952787c959copy hash to clipboard (diff)
builtin-merge.c