mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'da/p4merge-mktemp-fix' into maint
* da/p4merge-mktemp-fix: p4merge: fix printf usage
This commit is contained in:
commit
92f561d7f0
|
@ -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"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue