| changeset 591 | eb46971fc57f |
| parent 547 | 4fc63e22b1fe |
| child 749 | 7e4843b7efd2 |
| 590:38d106db75bc | 591:eb46971fc57f |
|---|---|
9 hg commit -t branch1 -u test -d "0 0" |
9 hg commit -t branch1 -u test -d "0 0" |
10 hg co 0 |
10 hg co 0 |
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 up -m 1 |
15 hg id |
15 hg id |
16 grep -Ev ">>>|<<<" a |
16 grep -Ev ">>>|<<<" a |
17 hg status |
17 hg status |