equal
deleted
inserted
replaced
2 |
2 |
3 set -x |
3 set -x |
4 hg init |
4 hg init |
5 echo "nothing" > a |
5 echo "nothing" > a |
6 hg add a |
6 hg add a |
7 hg commit -t ancestor -u test -d "0 0" |
7 hg commit -m ancestor -d "0 0" |
8 echo "something" > a |
8 echo "something" > a |
9 hg commit -t branch1 -u test -d "0 0" |
9 hg commit -m branch1 -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 -m branch2 -d "0 0" |
13 export HGMERGE=merge |
13 export HGMERGE=merge |
14 hg 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 |