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: tortoisemerge
can_diff () { return 1 } merge_cmd () { if $base_present then touch "$BACKUP" 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 check_unchanged 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 }
Upload File
Create Folder