Revision 1c52ecf4ba0f4f7af72775695fee653f50737c71 authored by Junio C Hamano on 14 December 2020, 18:30:05 UTC, committed by Junio C Hamano on 14 December 2020, 18:30:05 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3fc7fc1
p4merge
diff_cmd () {
empty_file=
# p4merge does not like /dev/null
if test "/dev/null" = "$LOCAL"
then
LOCAL="$(create_empty_file)"
fi
if test "/dev/null" = "$REMOTE"
then
REMOTE="$(create_empty_file)"
fi
"$merge_tool_path" "$LOCAL" "$REMOTE"
if test -n "$empty_file"
then
rm -f "$empty_file"
fi
}
merge_cmd () {
if ! $base_present
then
cp -- "$LOCAL" "$BASE"
create_virtual_base "$BASE" "$REMOTE"
fi
"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
}
create_empty_file () {
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
>"$empty_file"
printf "%s" "$empty_file"
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...