X7ROOT File Manager
Current Path:
/usr/libexec/git-core/mergetools
usr
/
libexec
/
git-core
/
mergetools
/
📁
..
📄
araxis
(392 B)
📄
bc3
(401 B)
📄
codecompare
(387 B)
📄
deltawalker
(628 B)
📄
diffuse
(282 B)
📄
ecmerge
(340 B)
📄
emerge
(415 B)
📄
gvimdiff
(29 B)
📄
gvimdiff2
(29 B)
📄
kdiff3
(499 B)
📄
kompare
(83 B)
📄
meld
(680 B)
📄
opendiff
(301 B)
📄
tkdiff
(224 B)
📄
tortoisemerge
(638 B)
📄
vimdiff
(625 B)
📄
vimdiff2
(29 B)
📄
xxdiff
(618 B)
Editing: araxis
diff_cmd () { "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { touch "$BACKUP" if $base_present then "$merge_tool_path" -wait -merge -3 -a1 \ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 else "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 fi check_unchanged } translate_merge_tool_path() { echo compare }
Upload File
Create Folder