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: deltawalker
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use DeltaWalker (requires a graphical session)" } merge_cmd () { # Adding $(pwd)/ in front of $MERGED should not be necessary. # However without it, DeltaWalker (at least v1.9.8 on Windows) # crashes with a JRE exception. The DeltaWalker user manual, # shows $(pwd)/ whenever the '-merged' options is given. # Adding it here seems to work around the problem. if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED" fi >/dev/null 2>&1 } merge_cmd_help () { echo "Use DeltaWalker (requires a graphical session)" } translate_merge_tool_path () { echo DeltaWalker } exit_code_trustable () { true }
Upload File
Create Folder