Merge branch 'da/p4merge-mktemp-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:05:56 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:05:56 +0000 (16:05 -0800)
commitc0acef9b8ae84e7f67a1c231eb97ecfd897c5651
treef202c00a61f29623d5d88f267bfc37b123fd84dc
parent30784198b766b19a639c199e4365f2a805fc08c6
parentd272c8497c2a38ecc9608f8580f7dc3587168168
Merge branch 'da/p4merge-mktemp-fix'

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