| changeset 2283 | e506c14382fd |
| parent 1933 | 7544700fd931 |
| child 4361 | 46280c004f22 |
| 2282:2efa636eb411 | 2283:e506c14382fd |
|---|---|
8 hg commit -m branch1 -d "1000000 0" |
8 hg commit -m branch1 -d "1000000 0" |
9 hg co 0 |
9 hg co 0 |
10 echo "something else" > a |
10 echo "something else" > a |
11 hg commit -m branch2 -d "1000000 0" |
11 hg commit -m branch2 -d "1000000 0" |
12 HGMERGE=merge; export HGMERGE |
12 HGMERGE=merge; export HGMERGE |
13 hg up -m 1 |
13 hg merge 1 |
14 hg id |
14 hg id |
15 egrep -v ">>>|<<<" a |
15 egrep -v ">>>|<<<" a |
16 hg status |
16 hg status |