projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 950b568) | patch
p4merge: fix printf usage
authorDavid Aguilar <davvid@gmail.com>
Sun, 10 Feb 2013 01:21:25 +0000 (17:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Feb 2013 19:40:52 +0000 (11:40 -0800)
commitd272c8497c2a38ecc9608f8580f7dc3587168168
treea37bde0cb9e59ea1fd751bcf25e4c79cef6dd269tree | snapshot
parent950b5680bdacd3eaa4a528f4dc2d5652f1beb88dcommit | diff
p4merge: fix printf usage

Do not use a random string as if it is a format string for printf
when showing it literally; instead feed it to '%s' format.

Reported-by: Asheesh Laroia <asheesh@asheesh.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/p4merge diff | blob | history
Git—the stupid content tracker