| author | mark.williamson@cl.cam.ac.uk |
| Sun, 10 Jul 2005 16:01:11 -0800 | |
| changeset 667 | 31a9aa890016 |
| parent 591 | eb46971fc57f |
| child 749 | 7e4843b7efd2 |
| permissions | -rwxr-xr-x |
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 |
#!/bin/sh |
| 346 | 2 |
|
3 |
set -x |
|
4 |
hg init |
|
5 |
echo "nothing" > a |
|
6 |
hg add a |
|
7 |
hg commit -t ancestor -u test -d "0 0" |
|
8 |
echo "something" > a |
|
9 |
hg commit -t branch1 -u test -d "0 0" |
|
10 |
hg co 0 |
|
11 |
echo "something else" > a |
|
12 |
hg commit -t branch2 -u test -d "0 0" |
|
13 |
export HGMERGE=merge |
|
| 591 | 14 |
hg up -m 1 |
| 346 | 15 |
hg id |
| 392 | 16 |
grep -Ev ">>>|<<<" a |
| 346 | 17 |
hg status |