| commit | d272c8497c2a38ecc9608f8580f7dc3587168168 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sun, 10 Feb 2013 01:21:25 +0000 (9 17:21 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Feb 2013 19:40:52 +0000 (10 11:40 -0800) | ||
| tree | a37bde0cb9e59ea1fd751bcf25e4c79cef6dd269 | treesnapshot (tar.gz zip) |
| parent | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d | commitdiff |
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>
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 | diffblobblamehistory |