From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:04:05 +0000 (-0800)
Subject: Merge branch 'da/p4merge-mktemp-fix' into maint
X-Git-Tag: v1.8.2-rc1~2^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92f561d7f0f249d7f15cddce1d438d229e689e87

Merge branch 'da/p4merge-mktemp-fix' into maint

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

92f561d7f0f249d7f15cddce1d438d229e689e87