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: tortoisemerge
can_diff () { return 1 } diff_cmd_help () { echo "Use TortoiseMerge (requires a graphical session)" } merge_cmd () { if $base_present then basename="$(basename "$merge_tool_path" .exe)" if test "$basename" = "tortoisegitmerge" then "$merge_tool_path" \ -base "$BASE" -mine "$LOCAL" \ -theirs "$REMOTE" -merged "$MERGED" else "$merge_tool_path" \ -base:"$BASE" -mine:"$LOCAL" \ -theirs:"$REMOTE" -merged:"$MERGED" fi else echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 fi } translate_merge_tool_path() { if type tortoisegitmerge >/dev/null 2>/dev/null then echo tortoisegitmerge else echo tortoisemerge fi } merge_cmd_help () { echo "Use TortoiseMerge (requires a graphical session)" }
Upload File
Create Folder