| araxis | |||
| bc | |||
| codecompare | |||
| deltawalker | |||
| diffmerge | |||
| diffuse | |||
| ecmerge | |||
| emerge | |||
| examdiff | |||
| guiffy | |||
| gvimdiff | |||
| kdiff3 | |||
| kompare | |||
| meld | |||
| nvimdiff | |||
| opendiff | |||
| smerge | |||
| tkdiff | |||
| tortoisemerge | |||
| vimdiff | |||
| winmerge | |||
| xxdiff |
|
Server : LiteSpeed System : Linux premium217.web-hosting.com 4.18.0-553.54.1.lve.el8.x86_64 #1 SMP Wed Jun 4 13:01:13 UTC 2025 x86_64 User : alloknri ( 880) PHP Version : 8.1.34 Disable Function : NONE Directory : /usr/libexec/git-core/mergetools/ |
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)"
}
| araxis | |||
| bc | |||
| codecompare | |||
| deltawalker | |||
| diffmerge | |||
| diffuse | |||
| ecmerge | |||
| emerge | |||
| examdiff | |||
| guiffy | |||
| gvimdiff | |||
| kdiff3 | |||
| kompare | |||
| meld | |||
| nvimdiff | |||
| opendiff | |||
| smerge | |||
| tkdiff | |||
| tortoisemerge | |||
| vimdiff | |||
| winmerge | |||
| xxdiff |