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

* da/p4merge-mktemp-fix: p4merge: fix printf usage
git · Feb 25, 2013 · 92f561d · 92f561d
2 parents 8552e2e + d272c84
commit 92f561d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"
 }