can_diff () { return 1 } 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 }
Name | Type | Size | Permission | Actions |
---|---|---|---|---|
araxis | File | 358 B | 0644 |
|
bc | File | 367 B | 0644 |
|
bc3 | File | 24 B | 0644 |
|
codecompare | File | 353 B | 0644 |
|
deltawalker | File | 663 B | 0644 |
|
diffmerge | File | 309 B | 0644 |
|
diffuse | File | 248 B | 0644 |
|
ecmerge | File | 306 B | 0644 |
|
emerge | File | 438 B | 0644 |
|
examdiff | File | 336 B | 0644 |
|
gvimdiff | File | 29 B | 0644 |
|
gvimdiff2 | File | 29 B | 0644 |
|
gvimdiff3 | File | 29 B | 0644 |
|
kdiff3 | File | 522 B | 0644 |
|
kompare | File | 117 B | 0644 |
|
meld | File | 843 B | 0644 |
|
opendiff | File | 267 B | 0644 |
|
p4merge | File | 617 B | 0644 |
|
tkdiff | File | 258 B | 0644 |
|
tortoisemerge | File | 602 B | 0644 |
|
vimdiff | File | 890 B | 0644 |
|
vimdiff2 | File | 29 B | 0644 |
|
vimdiff3 | File | 29 B | 0644 |
|
winmerge | File | 361 B | 0644 |
|
xxdiff | File | 584 B | 0644 |
|