| changeset 392 | ee4c80d294e5 |
| parent 346 | f69a5d2d4fe1 |
| child 544 | 3d4d5f2aba9a |
| child 547 | 4fc63e22b1fe |
| 391:5f65a108a559 | 392:ee4c80d294e5 |
|---|---|
11 echo "something else" > a |
11 echo "something else" > a |
12 hg commit -t branch2 -u test -d "0 0" |
12 hg commit -t branch2 -u test -d "0 0" |
13 export HGMERGE=merge |
13 export HGMERGE=merge |
14 hg -d up -m 1 |
14 hg -d up -m 1 |
15 hg id |
15 hg id |
16 cat a | grep -v ">>>" | grep -v "<<<" |
16 grep -Ev ">>>|<<<" a |
17 hg status |
17 hg status |