merge: rename variable
authorTay Ray Chuan <rctay89@gmail.com>
Mon, 10 May 2010 17:17:48 +0000 (01:17 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 May 2010 18:57:33 +0000 (11:57 -0700)
commit97d45bc...2f6bdd9cb164d151a6e064ffdcd5e2bc
treea53bf4f...70bdbba8888ceea4dd476af2b87ad4efcopy hash to clipboard (tree)
parent7558922...289ca8400388813af66c7219811e0334copy hash to clipboard (diff)
builtin/merge.c