Name	Size	Mode	Actions
araxis	358	0644	editdlrm
bc	367	0644	editdlrm
bc3	24	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
gvimdiff	29	0644	editdlrm
gvimdiff2	29	0644	editdlrm
gvimdiff3	29	0644	editdlrm
kdiff3	522	0644	editdlrm
kompare	117	0644	editdlrm
meld	843	0644	editdlrm
opendiff	267	0644	editdlrm
p4merge	617	0644	editdlrm
tkdiff	258	0644	editdlrm
tortoisemerge	602	0644	editdlrm
vimdiff	890	0644	editdlrm
vimdiff2	29	0644	editdlrm
vimdiff3	29	0644	editdlrm
winmerge	361	0644	editdlrm
xxdiff	584	0644	editdlrm

diff_cmd () { "$merge_tool_path" \ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { if $base_present then "$merge_tool_path" --auto \ --L1 "$MERGED (Base)" \ --L2 "$MERGED (Local)" \ --L3 "$MERGED (Remote)" \ -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 else "$merge_tool_path" --auto \ --L1 "$MERGED (Local)" \ --L2 "$MERGED (Remote)" \ -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi } exit_code_trustable () { true }