equal
deleted
inserted
replaced
816 |
816 |
817 XXX: we should handle this correctly here, this is not phase-divergence |
817 XXX: we should handle this correctly here, this is not phase-divergence |
818 resolution happening |
818 resolution happening |
819 |
819 |
820 $ hg evolve --continue |
820 $ hg evolve --continue |
821 evolving 19:5fd38c0de46e "added l to l" |
821 continuing interrupted 'phasedivergent' resolution is not yet supported |
822 working directory is now at 2598cf6ceb65 |
822 working directory is now at 8c2bb6fb44e9 |
823 |
823 |
824 $ hg glog |
824 $ hg glog |
825 @ 20:2598cf6ceb65 added l to l |
825 * 19:5fd38c0de46e added l to l |
826 | () draft |
826 | () draft |
827 | o 17:f3794e5a91dc added l to l |
827 | o 17:f3794e5a91dc added l to l |
828 |/ () public |
828 | | () public |
829 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: |
829 | @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: |
830 | () public |
830 | | () public |
831 o 12:dc88f5aa9bc9 y to y and foobar to foo |
831 | o 12:dc88f5aa9bc9 y to y and foobar to foo |
832 | () public |
832 | | () public |
833 o 9:2352021b3785 added x to x |
833 | o 9:2352021b3785 added x to x |
834 | (bm) public |
834 |/ (bm) public |
835 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
835 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
836 | () public |
836 | () public |
837 o 6:b756eb10ea73 added bar to bar |
837 o 6:b756eb10ea73 added bar to bar |
838 | () public |
838 | () public |
839 o 5:3d62500c673d phase-divergent update to aa071e5554e3: |
839 o 5:3d62500c673d phase-divergent update to aa071e5554e3: |