Merge branch 'al/mergetool-printf-fix'
* al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains %
Junio C Hamano committed
Feb 14, 2013 at 10:29 UTC
ba56d7057a5da9eb3485391658ba7465c855a8f3
No changes.