Current Path: > > > > usr > libexec > git-core > mergetools
Operation : Linux premium131.web-hosting.com 4.18.0-553.44.1.lve.el8.x86_64 #1 SMP Thu Mar 13 14:29:12 UTC 2025 x86_64 Software : Apache Server IP : 162.0.232.56 | Your IP: 216.73.216.111 Domains : 1034 Domain(s) Permission : [ 0755 ]
| Name | Type | Size | Last Modified | Actions |
|---|---|---|---|---|
| araxis | File | 515 bytes | June 13 2025 22:14:31. | |
| bc | File | 584 bytes | June 13 2025 22:14:31. | |
| codecompare | File | 510 bytes | June 13 2025 22:14:31. | |
| deltawalker | File | 818 bytes | June 13 2025 22:14:31. | |
| diffmerge | File | 460 bytes | June 13 2025 22:14:31. | |
| diffuse | File | 395 bytes | June 13 2025 22:14:31. | |
| ecmerge | File | 453 bytes | June 13 2025 22:14:31. | |
| emerge | File | 535 bytes | June 13 2025 22:14:31. | |
| examdiff | File | 493 bytes | June 13 2025 22:14:31. | |
| guiffy | File | 432 bytes | June 13 2025 22:14:31. | |
| gvimdiff | File | 29 bytes | June 13 2025 22:14:31. | |
| kdiff3 | File | 818 bytes | June 13 2025 22:14:31. | |
| kompare | File | 264 bytes | June 13 2025 22:14:31. | |
| meld | File | 2213 bytes | June 13 2025 22:14:31. | |
| nvimdiff | File | 29 bytes | June 13 2025 22:14:31. | |
| opendiff | File | 418 bytes | June 13 2025 22:14:31. | |
| smerge | File | 423 bytes | June 13 2025 22:14:31. | |
| tkdiff | File | 403 bytes | June 13 2025 22:14:31. | |
| tortoisemerge | File | 761 bytes | June 13 2025 22:14:31. | |
| vimdiff | File | 17505 bytes | June 13 2025 22:14:31. | |
| winmerge | File | 510 bytes | June 13 2025 22:14:31. | |
| xxdiff | File | 913 bytes | June 13 2025 22:14:31. |
diff_cmd () {
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}
diff_cmd_help () {
echo "Use ECMerge (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
--default --mode=merge3 --to="$MERGED"
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
--default --mode=merge2 --to="$MERGED"
fi
}
merge_cmd_help () {
echo "Use ECMerge (requires a graphical session)"
}
SILENT KILLER Tool