mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* da/p4merge-mktemp-fix:
  p4merge: fix printf usage
This commit is contained in:
Junio C Hamano
2013-02-25 08:04:05 -08:00
parent 8552e2e590 d272c8497c
commit 92f561d7f0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mergetools/p4merge
View File

@ -30,5 +30,5 @@ create_empty_file () {
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$" empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
>"$empty_file" >"$empty_file"
printf "$empty_file" printf "%s" "$empty_file"
} }