equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
2 |
2 |
3 set -x |
|
4 hg init |
3 hg init |
5 echo "nothing" > a |
4 echo "nothing" > a |
6 hg add a |
5 hg add a |
7 hg commit -m ancestor -d "0 0" |
6 hg commit -m ancestor -d "0 0" |
8 echo "something" > a |
7 echo "something" > a |
9 hg commit -m branch1 -d "0 0" |
8 hg commit -m branch1 -d "0 0" |
10 hg co 0 |
9 hg co 0 |
11 echo "something else" > a |
10 echo "something else" > a |
12 hg commit -m branch2 -d "0 0" |
11 hg commit -m branch2 -d "0 0" |
13 export HGMERGE=merge |
12 HGMERGE=merge; export HGMERGE |
14 hg up -m 1 |
13 hg up -m 1 |
15 hg id |
14 hg id |
16 grep -Ev ">>>|<<<" a |
15 grep -Ev ">>>|<<<" a |
17 hg status |
16 hg status |