| author | kyle@zeus.moffetthome.net |
| Fri, 24 Jun 2005 20:53:51 -0500 | |
| changeset 463 | ea93402b81b9 |
| parent 392 | ee4c80d294e5 |
| child 544 | 3d4d5f2aba9a |
| child 547 | 4fc63e22b1fe |
| permissions | -rwxr-xr-x |
| 346 | 1 |
#!/bin/bash |
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 |
|
14 |
hg -d up -m 1 |
|
15 |
hg id |
|
| 392 | 16 |
grep -Ev ">>>|<<<" a |
| 346 | 17 |
hg status |