merge-recursive: tweak magic band-aid
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2011 05:22:06 +0000 (22:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2011 05:22:06 +0000 (22:22 -0700)
commitb9b3eef...6186d423efb684d01b3e99ef010a61de
treef839064...11cf5af7b0839ccbabee3bd645747904copy hash to clipboard (tree)
parentb2c8c0a...62745768e8fb249949801c1aed8f7c1dcopy hash to clipboard (diff)
merge-recursive.c