Merge branch 'al/mergetool-printf-fix' into maint
* al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains %
Junio C Hamano committed
Feb 25, 2013 at 08:04 UTC
b79faa99e6c4eac658130c5b6291dc0145164293
No changes.