From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2013 18:29:37 +0000 (-0800)
Subject: Merge branch 'al/mergetool-printf-fix'
X-Git-Url: http://git.tremily.us/?p=git.git;a=commitdiff_plain;h=ba56d7057a5da9eb3485391658ba7465c855a8f3

Merge branch 'al/mergetool-printf-fix'

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

ba56d7057a5da9eb3485391658ba7465c855a8f3