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)
commitb79faa99e6c4eac658130c5b6291dc0145164293
tree4cc1bee7dd2909ccf5f69500533173faf072ccb0
parent75288cc7e120cfcce4b11699d034bcadccdf9344
parent2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5
Merge branch 'al/mergetool-printf-fix' into maint

* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %