| changeset 3288 | 438b0638dbf5 |
| parent 3280 | ae85272b59a4 |
| child 3988 | 9dcf9d45cab8 |
| 3282:f49c90b46897 | 3288:438b0638dbf5 |
|---|---|
3 mkdir -p t |
3 mkdir -p t |
4 cd t |
4 cd t |
5 |
5 |
6 cat <<'EOF' > merge |
6 cat <<'EOF' > merge |
7 #!/bin/sh |
7 #!/bin/sh |
8 echo merge > $1 |
8 echo merge $1 $2 $3 > $1 |
9 EOF |
9 EOF |
10 chmod +x merge |
10 chmod +x merge |
11 |
11 |
12 # perform a test merge with possible renaming |
12 # perform a test merge with possible renaming |
13 # |
13 # |