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: diffuse
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } diff_cmd_help () { echo "Use Diffuse (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" \ "$BASE" | cat else "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi } merge_cmd_help () { echo "Use Diffuse (requires a graphical session)" }
Upload File
Create Folder