summaryrefslogtreecommitdiff
path: root/Documentation/gitglossary.txt
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2013-02-09 17:21:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-10 11:40:52 -0800
commitd272c8497c2a38ecc9608f8580f7dc3587168168 (patch)
treea37bde0cb9e59ea1fd751bcf25e4c79cef6dd269 /Documentation/gitglossary.txt
parentmergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder (diff)
downloadtgif-d272c8497c2a38ecc9608f8580f7dc3587168168.tar.xz
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>
Diffstat (limited to 'Documentation/gitglossary.txt')
0 files changed, 0 insertions, 0 deletions