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

* da/p4merge-mktemp-fix:
  p4merge: fix printf usage
This commit is contained in:
Junio C Hamano 2013-02-25 08:04:05 -08:00
commit 92f561d7f0

View 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"
}