summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-15 00:05:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-15 00:05:56 (GMT)
commitc0acef9b8ae84e7f67a1c231eb97ecfd897c5651 (patch)
treef202c00a61f29623d5d88f267bfc37b123fd84dc /mergetools
parent30784198b766b19a639c199e4365f2a805fc08c6 (diff)
parentd272c8497c2a38ecc9608f8580f7dc3587168168 (diff)
downloadgit-c0acef9b8ae84e7f67a1c231eb97ecfd897c5651.zip
git-c0acef9b8ae84e7f67a1c231eb97ecfd897c5651.tar.gz
git-c0acef9b8ae84e7f67a1c231eb97ecfd897c5651.tar.bz2
Merge branch 'da/p4merge-mktemp-fix'
* da/p4merge-mktemp-fix: p4merge: fix printf usage
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/p4merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 52f7c8f..8a36916 100644
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -30,5 +30,5 @@ create_empty_file () {
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
>"$empty_file"
- printf "$empty_file"
+ printf "%s" "$empty_file"
}