equal
deleted
inserted
replaced
9 hg init t |
9 hg init t |
10 cd t |
10 cd t |
11 |
11 |
12 touch 1 |
12 touch 1 |
13 touch 2 |
13 touch 2 |
14 hg commit -Am init -d "0 0" # 0 |
14 hg commit -Am init # 0 |
15 |
15 |
16 hg rename 1 1a |
16 hg rename 1 1a |
17 hg commit -m rename -d "0 0" # 1 |
17 hg commit -m rename # 1 |
18 |
18 |
19 hg co -C 0 |
19 hg co -C 0 |
20 echo unrelated >> 2 |
20 echo unrelated >> 2 |
21 hg ci -m unrelated1 -d "0 0" # 2 |
21 hg ci -m unrelated1 # 2 |
22 |
22 |
23 hg merge --debug 1 |
23 hg merge --debug 1 |
24 hg ci -m merge1 -d "0 0" # 3 |
24 hg ci -m merge1 # 3 |
25 |
25 |
26 hg co -C 2 |
26 hg co -C 2 |
27 echo hello >> 1 |
27 echo hello >> 1 |
28 hg ci -m unrelated2 -d "0 0" # 4 |
28 hg ci -m unrelated2 # 4 |
29 |
29 |
30 hg co -C 3 |
30 hg co -C 3 |
31 hg merge -y --debug 4 |
31 hg merge -y --debug 4 |
32 |
32 |
33 hg co -C 4 |
33 hg co -C 4 |