Merge branch 'al/mergetool-printf-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:01 +0000 (08:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:01 +0000 (08:04 -0800)
commitb79faa9...e6c4eac658130c5b6291dc0145164293
tree4cc1bee...dd2909ccf5f69500533173faf072ccb0copy hash to clipboard (tree)
parent75288cc...e120cfcce4b11699d034bcadccdf9344copy hash to clipboard (diff)
parent2a9ccff...5553b8ab28eb5a172738cc9f3afadcd5copy hash to clipboard (diff)