diff_cmd () {
"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
return 0
}
diff_cmd_help () {
echo "Use WinMerge (requires a graphical session)"
}
merge_cmd () {
# mergetool.winmerge.trustExitCode is implicitly false.
# touch $BACKUP so that we can check_unchanged.
"$merge_tool_path" -u -e -dl Local -dr Remote \
"$LOCAL" "$REMOTE" "$MERGED"
}
translate_merge_tool_path() {
mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}
merge_cmd_help () {
echo "Use WinMerge (requires a graphical session)"
}
| Name | Type | Size | Permission | Actions |
|---|---|---|---|---|
| araxis | File | 515 B | 0644 |
|
| bc | File | 584 B | 0644 |
|
| codecompare | File | 510 B | 0644 |
|
| deltawalker | File | 818 B | 0644 |
|
| diffmerge | File | 460 B | 0644 |
|
| diffuse | File | 395 B | 0644 |
|
| ecmerge | File | 453 B | 0644 |
|
| emerge | File | 535 B | 0644 |
|
| examdiff | File | 493 B | 0644 |
|
| guiffy | File | 432 B | 0644 |
|
| gvimdiff | File | 29 B | 0644 |
|
| kdiff3 | File | 818 B | 0644 |
|
| kompare | File | 264 B | 0644 |
|
| meld | File | 2.16 KB | 0644 |
|
| nvimdiff | File | 29 B | 0644 |
|
| opendiff | File | 418 B | 0644 |
|
| smerge | File | 423 B | 0644 |
|
| tkdiff | File | 403 B | 0644 |
|
| tortoisemerge | File | 761 B | 0644 |
|
| vimdiff | File | 17.09 KB | 0644 |
|
| winmerge | File | 510 B | 0644 |
|
| xxdiff | File | 913 B | 0644 |
|