changeset 5244 | dee573ba79f1 |
parent 3748 | 7b88bd88f040 |
5243:8050f13772f6 | 5244:dee573ba79f1 |
---|---|
22 |
22 |
23 hg merge --debug 1 |
23 hg merge --debug 1 |
24 echo 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 hg debugrename b/c |
|
27 |
28 |
28 hg co -C 1 |
29 hg co -C 1 |
29 hg merge --debug 2 |
30 hg merge --debug 2 |
30 echo a/* b/* |
31 echo a/* b/* |
31 hg st -C |
32 hg st -C |
32 hg ci -m "4 merge 1+2" -d "0 0" |
33 hg ci -m "4 merge 1+2" -d "0 0" |
34 hg debugrename b/c |