Sync with 1.7.9.6
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 20:09:21 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 20:11:49 +0000 (13:11 -0700)
commitd82829b...128263951569221ca0c00dd143da055c
tree3d24c2c...be3a76cc7574cd5f65732cd3ac9c3450copy hash to clipboard (tree)
parent02f419e...cbda05f9923306ae1fcdd754187563facopy hash to clipboard (diff)
parentcb2ed32...fc917db0b79d7b1f3756575ffa5f70d5copy hash to clipboard (diff)
builtin/merge.c