| changeset 1880 | 05c7d75be925 |
| parent 1798 | d610fe0e6893 |
| child 1881 | 4392ccefe432 |
| child 1883 | b98160cfb2f3 |
| 1879:9ef0850b9b68 | 1880:05c7d75be925 |
|---|---|
4 # |
4 # |
5 # This tries to find a way to do three-way merge on the current system. |
5 # This tries to find a way to do three-way merge on the current system. |
6 # The result ought to end up in $1. |
6 # The result ought to end up in $1. |
7 |
7 |
8 set -e # bail out quickly on failure |
8 set -e # bail out quickly on failure |
9 |
|
10 echo $1 $2 $3 |
|
9 |
11 |
10 LOCAL="$1" |
12 LOCAL="$1" |
11 BASE="$2" |
13 BASE="$2" |
12 OTHER="$3" |
14 OTHER="$3" |
13 |
15 |