Mercurial > hg-stable
annotate tests/test-conflict @ 945:f15901d053e1
Merge with MPM.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 18 Aug 2005 12:32:15 -0800 |
| parents | 0902ffece4b4 |
| children | c71420b186b0 |
| rev | line source |
|---|---|
|
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 hg init | |
| 4 echo "nothing" > a | |
| 5 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
6 hg commit -m ancestor -d "0 0" |
| 346 | 7 echo "something" > a |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
8 hg commit -m branch1 -d "0 0" |
| 346 | 9 hg co 0 |
| 10 echo "something else" > a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
11 hg commit -m branch2 -d "0 0" |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
12 HGMERGE=merge; export HGMERGE |
| 591 | 13 hg up -m 1 |
| 346 | 14 hg id |
| 392 | 15 grep -Ev ">>>|<<<" a |
| 346 | 16 hg status |