From: Junio C Hamano Date: Mon, 25 Feb 2013 16:04:01 +0000 (-0800) Subject: Merge branch 'al/mergetool-printf-fix' into maint X-Git-Tag: v1.8.2-rc1~2^2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b79faa99e6c4eac658130c5b6291dc0145164293?ds=inline;hp=--cc Merge branch 'al/mergetool-printf-fix' into maint * al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains % --- b79faa99e6c4eac658130c5b6291dc0145164293