can_diff () { return 1 } merge_cmd () { if $base_present then touch "$BACKUP" 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 check_unchanged 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 | 392 B | 0644 |
|
bc3 | File | 401 B | 0644 |
|
codecompare | File | 387 B | 0644 |
|
deltawalker | File | 628 B | 0644 |
|
diffuse | File | 282 B | 0644 |
|
ecmerge | File | 340 B | 0644 |
|
emerge | File | 415 B | 0644 |
|
gvimdiff | File | 29 B | 0644 |
|
gvimdiff2 | File | 29 B | 0644 |
|
kdiff3 | File | 499 B | 0644 |
|
kompare | File | 83 B | 0644 |
|
meld | File | 680 B | 0644 |
|
opendiff | File | 301 B | 0644 |
|
tkdiff | File | 224 B | 0644 |
|
tortoisemerge | File | 638 B | 0644 |
|
vimdiff | File | 625 B | 0644 |
|
vimdiff2 | File | 29 B | 0644 |
|
xxdiff | File | 618 B | 0644 |
|