Name	Size	Mode	Actions
araxis	358	0644	editdlrm
bc	423	0644	editdlrm
codecompare	353	0644	editdlrm
deltawalker	663	0644	editdlrm
diffmerge	309	0644	editdlrm
diffuse	248	0644	editdlrm
ecmerge	306	0644	editdlrm
emerge	438	0644	editdlrm
examdiff	336	0644	editdlrm
guiffy	263	0644	editdlrm
gvimdiff	29	0644	editdlrm
kdiff3	673	0644	editdlrm
kompare	117	0644	editdlrm
meld	1986	0644	editdlrm
nvimdiff	29	0644	editdlrm
opendiff	267	0644	editdlrm
p4merge	617	0644	editdlrm
smerge	264	0644	editdlrm
tkdiff	258	0644	editdlrm
tortoisemerge	602	0644	editdlrm
vimdiff	1220	0644	editdlrm
winmerge	361	0644	editdlrm
xxdiff	768	0644	editdlrm

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" }