Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5747:8e4f6354b316 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: back out changeset b3d9e6c805d6
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 28 Jan 2021 18:48:36 +0800
parents e5d91fd1f319
children 03410b04cf10
comparison
equal deleted inserted replaced
5746:feb28638ec6c 5747:8e4f6354b316
858 rebasing to destination parent: 8c2bb6fb44e9 858 rebasing to destination parent: 8c2bb6fb44e9
859 merging x 859 merging x
860 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') 860 warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
861 unresolved merge conflicts 861 unresolved merge conflicts
862 (see 'hg help evolve.interrupted') 862 (see 'hg help evolve.interrupted')
863 [240] 863 [1]
864 864
865 $ hg diff 865 $ hg diff
866 diff -r 8c2bb6fb44e9 l 866 diff -r 8c2bb6fb44e9 l
867 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 867 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
868 +++ b/l Thu Jan 01 00:00:00 1970 +0000 868 +++ b/l Thu Jan 01 00:00:00 1970 +0000