Merge branch 'da/p4merge-mktemp-fix'

* da/p4merge-mktemp-fix: p4merge: fix printf usage
12 years ago · c0acef9b8a
1 changed files with 1 additions and 1 deletions
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@ -30,5 +30,5 @@ create_empty_file () {
				@@ -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"
 }