mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-06 19:16:11 +02:00
Code

Merge branch 'da/p4merge-mktemp-fix' 

* da/p4merge-mktemp-fix:
  p4merge: fix printf usage
This commit is contained in:
Junio C Hamano 2013-02-14 16:05:56 -08:00
parent 30784198b7 d272c8497c
commit c0acef9b8a
1 changed files with 1 additions and 1 deletions
Show Stats 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"
printf "$empty_file"
printf "%s" "$empty_file"
}