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: deltawalker
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } 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 } translate_merge_tool_path() { echo DeltaWalker }
Upload File
Create Folder