From: Junio C Hamano <gitster@pobox.com>
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: http://git.ipfire.org/?a=commitdiff_plain;h=b79faa99e6c4eac658130c5b6291dc0145164293;p=thirdparty%2Fgit.git

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