equal
deleted
inserted
replaced
790 recreate:[19] added l to l |
790 recreate:[19] added l to l |
791 atop:[17] added l to l |
791 atop:[17] added l to l |
792 rebasing to destination parent: 8c2bb6fb44e9 |
792 rebasing to destination parent: 8c2bb6fb44e9 |
793 merging x |
793 merging x |
794 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
794 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
795 evolution failed! |
795 abort: fix conflicts and see `hg help evolve.interrupted` |
796 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` |
|
797 abort: unresolved merge conflicts (see hg help resolve) |
|
798 [255] |
796 [255] |
799 |
797 |
800 $ hg diff |
798 $ hg diff |
801 diff -r 8c2bb6fb44e9 l |
799 diff -r 8c2bb6fb44e9 l |
802 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
800 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |