Show More
| @@ -44,6 +44,16 b' elif [ -n "$DIFF3" ]; then' | |||||
| 44 | cp "$LOCAL.orig" "$LOCAL" |
|
44 | cp "$LOCAL.orig" "$LOCAL" | |
| 45 | fi |
|
45 | fi | |
| 46 |
|
46 | |||
|
|
47 | # on MacOS X try opendiff | |||
|
|
48 | # (uses FileMerge.app, shipped with Apple's developer tools) | |||
|
|
49 | if type opendiff > /dev/null 2>&1; then | |||
|
|
50 | opendiff "$LOCAL.orig" "$OTHER" -ancestor "$BASE" -merge "$LOCAL" || exit 1 | |||
|
|
51 | # prevent $OTHER from being removed too early | |||
|
|
52 | # can surely be done in a more elegant way | |||
|
|
53 | sleep 1 | |||
|
|
54 | exit 0 | |||
|
|
55 | fi | |||
|
|
56 | ||||
| 47 | if [ -n "$DISPLAY" ]; then |
|
57 | if [ -n "$DISPLAY" ]; then | |
| 48 | # try using kdiff3, which is fairly nice |
|
58 | # try using kdiff3, which is fairly nice | |
| 49 | if type kdiff3 > /dev/null 2>&1; then |
|
59 | if type kdiff3 > /dev/null 2>&1; then | |
General Comments 0
You need to be logged in to leave comments.
Login now