Merge branch 'al/mergetool-printf-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:37 +0000 (10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:37 +0000 (10:29 -0800)
commitba56d7057a5da9eb3485391658ba7465c855a8f3
treea0773d7dc3fcc6c91e1df1fc34098e203bf9e37e
parent393b7c3cd7c87a42e2e477de38d4a6e4981db8bb
parent2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5
Merge branch 'al/mergetool-printf-fix'

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