equal
deleted
inserted
replaced
16 hg commit -m 'add empty3' -d '1000000 0' |
16 hg commit -m 'add empty3' -d '1000000 0' |
17 |
17 |
18 hg heads |
18 hg heads |
19 |
19 |
20 hg merge 1 |
20 hg merge 1 |
21 # before changeset 05257fd28591, we didn't notice the |
21 # before changeset 05257fd28591, we didn't notice the |
22 # empty file that came from rev 1. |
22 # empty file that came from rev 1. |
23 hg status |
23 hg status |
24 hg commit -m merge -d '1000000 0' |
24 hg commit -m merge -d '1000000 0' |
25 hg manifest --debug tip |
25 hg manifest --debug tip |