Initial class construction
This commit is contained in:
1 parent
67f2d57e03
commit
431ff5f7d4
5813 files changed
+1622108
No files matched your search
@@ -0,0 +1,36 @@
|
||||
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"
|
||||
}
|
||||
Reference in new issue
Block a user