summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:04:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:04:05 -0800
commit92f561d7f0f249d7f15cddce1d438d229e689e87 (patch)
tree503257255069f121840a4b70a65827b1fdb63e73
parentMerge branch 'bw/get-tz-offset-perl' into maint (diff)
parentp4merge: fix printf usage (diff)
downloadtgif-92f561d7f0f249d7f15cddce1d438d229e689e87.tar.xz
Merge branch 'da/p4merge-mktemp-fix' into maint
* da/p4merge-mktemp-fix: p4merge: fix printf usage
-rw-r--r--mergetools/p4merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 52f7c8f705..8a36916567 100644
--- 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"
}