D7net
Home
Console
Upload
information
Create File
Create Folder
About
Tools
:
/
usr
/
libexec
/
git-core
/
mergetools
/
Filename :
tortoisemerge
back
Copy
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)" }
Name
Size
Last Modified
Owner
Permissions
Actions
araxis
0.503
KB
May 31 2024 12:41:06
root
0644
bc
0.57
KB
May 31 2024 12:41:06
root
0644
codecompare
0.498
KB
May 31 2024 12:41:06
root
0644
deltawalker
0.799
KB
May 31 2024 12:41:06
root
0644
diffmerge
0.449
KB
May 31 2024 12:41:06
root
0644
diffuse
0.386
KB
May 31 2024 12:41:06
root
0644
ecmerge
0.442
KB
May 31 2024 12:41:06
root
0644
emerge
0.522
KB
May 31 2024 12:41:06
root
0644
examdiff
0.481
KB
May 31 2024 12:41:06
root
0644
guiffy
0.422
KB
May 31 2024 12:41:06
root
0644
gvimdiff
0.028
KB
May 31 2024 12:41:06
root
0644
kdiff3
0.799
KB
May 31 2024 12:41:06
root
0644
kompare
0.258
KB
May 31 2024 12:41:06
root
0644
meld
2.161
KB
May 31 2024 12:41:06
root
0644
nvimdiff
0.028
KB
May 31 2024 12:41:06
root
0644
opendiff
0.408
KB
May 31 2024 12:41:06
root
0644
smerge
0.413
KB
May 31 2024 12:41:06
root
0644
tkdiff
0.394
KB
May 31 2024 12:41:06
root
0644
tortoisemerge
0.743
KB
May 31 2024 12:41:06
root
0644
vimdiff
17.095
KB
May 31 2024 12:41:06
root
0644
winmerge
0.498
KB
May 31 2024 12:41:06
root
0644
xxdiff
0.892
KB
May 31 2024 12:41:06
root
0644
2017 © D7net | D704T team