//usr/libexec/git-core/mergetools
23 items
NAME ↑ SIZE MODIFIED PERMS ACTIONS
.. / Parent Directory
araxis — 515 B
2025-06-13 22:20 · rw-r--r--
515 B 2025-06-13 22:20 rw-r--r--
bc — 584 B
2025-06-13 22:20 · rw-r--r--
584 B 2025-06-13 22:20 rw-r--r--
codecompare — 510 B
2025-06-13 22:20 · rw-r--r--
510 B 2025-06-13 22:20 rw-r--r--
deltawalker — 818 B
2025-06-13 22:20 · rw-r--r--
818 B 2025-06-13 22:20 rw-r--r--
diffmerge — 460 B
2025-06-13 22:20 · rw-r--r--
460 B 2025-06-13 22:20 rw-r--r--
diffuse — 395 B
2025-06-13 22:20 · rw-r--r--
395 B 2025-06-13 22:20 rw-r--r--
ecmerge — 453 B
2025-06-13 22:20 · rw-r--r--
453 B 2025-06-13 22:20 rw-r--r--
emerge — 535 B
2025-06-13 22:20 · rw-r--r--
535 B 2025-06-13 22:20 rw-r--r--
examdiff — 493 B
2025-06-13 22:20 · rw-r--r--
493 B 2025-06-13 22:20 rw-r--r--
guiffy — 432 B
2025-06-13 22:20 · rw-r--r--
432 B 2025-06-13 22:20 rw-r--r--
gvimdiff — 29 B
2025-06-13 22:20 · rw-r--r--
29 B 2025-06-13 22:20 rw-r--r--
kdiff3 — 818 B
2025-06-13 22:20 · rw-r--r--
818 B 2025-06-13 22:20 rw-r--r--
kompare — 264 B
2025-06-13 22:20 · rw-r--r--
264 B 2025-06-13 22:20 rw-r--r--
meld — 2.16 KB
2025-06-13 22:20 · rw-r--r--
2.16 KB 2025-06-13 22:20 rw-r--r--
nvimdiff — 29 B
2025-06-13 22:20 · rw-r--r--
29 B 2025-06-13 22:20 rw-r--r--
opendiff — 418 B
2025-06-13 22:20 · rw-r--r--
418 B 2025-06-13 22:20 rw-r--r--
smerge — 423 B
2025-06-13 22:20 · rw-r--r--
423 B 2025-06-13 22:20 rw-r--r--
tkdiff — 403 B
2025-06-13 22:20 · rw-r--r--
403 B 2025-06-13 22:20 rw-r--r--
tortoisemerge — 761 B
2025-06-13 22:20 · rw-r--r--
761 B 2025-06-13 22:20 rw-r--r--
vimdiff — 17.23 KB
2025-06-13 22:20 · rw-r--r--
17.23 KB 2025-06-13 22:20 rw-r--r--
vscode — 373 B
2025-06-13 22:20 · rw-r--r--
373 B 2025-06-13 22:20 rw-r--r--
winmerge — 510 B
2025-06-13 22:20 · rw-r--r--
510 B 2025-06-13 22:20 rw-r--r--
xxdiff — 913 B
2025-06-13 22:20 · rw-r--r--
913 B 2025-06-13 22:20 rw-r--r--
ONLINE
mergetools
23 items
18:25:50
TERMINAL FM
NAVIGATION
ACTIONS
SELECTION
Edit
Preview
Download
Rename
Copy
Chmod
Delete
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)" }