X7ROOT File Manager
Current Path:
/usr/libexec/git-core/mergetools
usr
/
libexec
/
git-core
/
mergetools
/
??
..
??
araxis
(515 B)
??
bc
(584 B)
??
codecompare
(510 B)
??
deltawalker
(818 B)
??
diffmerge
(460 B)
??
diffuse
(395 B)
??
ecmerge
(453 B)
??
emerge
(535 B)
??
examdiff
(493 B)
??
guiffy
(432 B)
??
gvimdiff
(29 B)
??
kdiff3
(818 B)
??
kompare
(264 B)
??
meld
(2.16 KB)
??
nvimdiff
(29 B)
??
opendiff
(418 B)
??
smerge
(423 B)
??
tkdiff
(403 B)
??
tortoisemerge
(761 B)
??
vimdiff
(17.09 KB)
??
winmerge
(510 B)
??
xxdiff
(913 B)
Editing: araxis
diff_cmd () { "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } merge_cmd () { 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 } merge_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } translate_merge_tool_path() { echo compare }
Upload File
Create Folder