diff_cmd () { "$merge_tool_path" \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ "$LOCAL" "$REMOTE" } merge_cmd () { touch "$BACKUP" if $base_present then "$merge_tool_path" -X --show-merged-pane \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" -X $extra \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi check_unchanged }
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 |
|