equal
deleted
inserted
replaced
666 with: [23] added z |
666 with: [23] added z |
667 base: [22] added z |
667 base: [22] added z |
668 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
668 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
669 merging y |
669 merging y |
670 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
670 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
671 abort: unresolved merge conflicts (see hg help resolve) |
671 fix conflicts and see `hg help evolve.interrupted` |
672 [255] |
672 [1] |
673 |
673 |
674 $ hg diff |
674 $ hg diff |
675 diff -r 7bbcf24ddecf y |
675 diff -r 7bbcf24ddecf y |
676 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
676 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
677 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
677 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |