equal
deleted
inserted
replaced
679 commit: (clean) |
679 commit: (clean) |
680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
681 phases: 3 draft |
681 phases: 3 draft |
682 phase-divergent: 1 changesets |
682 phase-divergent: 1 changesets |
683 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
683 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
684 $ hg log -r 'divergent()' |
684 $ hg log -r 'contentdivergent()' |
685 changeset: 12:6db5e282cb91 |
685 changeset: 12:6db5e282cb91 |
686 parent: 10:2033b4e49474 |
686 parent: 10:2033b4e49474 |
687 user: test |
687 user: test |
688 date: Thu Jan 01 00:00:00 1970 +0000 |
688 date: Thu Jan 01 00:00:00 1970 +0000 |
689 instability: phase-divergent, content-divergent |
689 instability: phase-divergent, content-divergent |