From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Feb 2013 00:05:56 +0000 (-0800)
Subject: Merge branch 'da/p4merge-mktemp-fix'
X-Git-Tag: v1.8.2-rc0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0acef9b8ae84e7f67a1c231eb97ecfd897c5651;p=thirdparty%2Fgit.git

Merge branch 'da/p4merge-mktemp-fix'

* da/p4merge-mktemp-fix:
  p4merge: fix printf usage
---

c0acef9b8ae84e7f67a1c231eb97ecfd897c5651