equal
deleted
inserted
replaced
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 hg merge 1 |
12 hg merge 1 |
13 hg id |
13 hg id |
14 egrep -v ">>>|<<<" a |
14 cat a |
15 hg status |
15 hg status |