Merge branch 'da/p4merge-mktemp-fix' into maint

* da/p4merge-mktemp-fix: p4merge: fix printf usage
2013-02-25 08:04:05 -08:00 · 2013-02-25 08:04:05 -08:00 · 92f561d7f0
commit 92f561d7f0
parent 8552e2e590 d272c8497c
1 changed files with 1 additions and 1 deletions
--- 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"
 }