Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pack_refs(): change to use do_for_each_entry()
[gitweb.git]
/
mergetools
/
p4merge
diff --git
a/mergetools/p4merge
b/mergetools/p4merge
index 52f7c8f70578929432becdd58a7fb423398f8de8..8a36916567a234c354af9994df9c28788749e7fa 100644
(file)
--- 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"
}