Name	Size	Mode	Actions
araxis	515	0644	editdlrm
bc	584	0644	editdlrm
codecompare	510	0644	editdlrm
deltawalker	818	0644	editdlrm
diffmerge	460	0644	editdlrm
diffuse	395	0644	editdlrm
ecmerge	453	0644	editdlrm
emerge	535	0644	editdlrm
examdiff	493	0644	editdlrm
guiffy	432	0644	editdlrm
gvimdiff	29	0644	editdlrm
kdiff3	818	0644	editdlrm
kompare	264	0644	editdlrm
meld	2213	0644	editdlrm
nvimdiff	29	0644	editdlrm
opendiff	418	0644	editdlrm
p4merge	784	0644	editdlrm
smerge	423	0644	editdlrm
tkdiff	403	0644	editdlrm
tortoisemerge	761	0644	editdlrm
vimdiff	17505	0644	editdlrm
winmerge	510	0644	editdlrm
xxdiff	913	0644	editdlrm

diff_cmd () { "$merge_tool_path" \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl+G"' \ "$LOCAL" "$REMOTE" # xxdiff can segfault on binary files which are often uninteresting. # Do not allow segfaults to stop us from continuing on to the next file. if test $? = 128 then return 1 fi } diff_cmd_help () { echo "Use xxdiff (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -X --show-merged-pane \ -R 'Accel.SaveAsMerged: "Ctrl+S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl+G"' \ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" -X $extra \ -R 'Accel.SaveAsMerged: "Ctrl+S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl+G"' \ --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi } merge_cmd_help () { echo "Use xxdiff (requires a graphical session)" }