equal
deleted
inserted
replaced
19 echo baz > a/c |
19 echo baz > a/c |
20 hg add a/c |
20 hg add a/c |
21 hg ci -m "2 add a/c" -d "0 0" |
21 hg ci -m "2 add a/c" -d "0 0" |
22 |
22 |
23 hg merge --debug 1 |
23 hg merge --debug 1 |
24 ls a/ b/ |
24 echo a/* b/* |
25 hg st -C |
25 hg st -C |
26 hg ci -m "3 merge 2+1" -d "0 0" |
26 hg ci -m "3 merge 2+1" -d "0 0" |
27 |
27 |
28 hg co -C 1 |
28 hg co -C 1 |
29 hg merge --debug 2 |
29 hg merge --debug 2 |
30 ls a/ b/ |
30 echo a/* b/* |
31 hg st -C |
31 hg st -C |
32 hg ci -m "4 merge 1+2" -d "0 0" |
32 hg ci -m "4 merge 1+2" -d "0 0" |