Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5666:e5d91fd1f319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update with more detailed exit codes CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents c2fab88e6d60
children 8e4f6354b316 254e135b46ef
comparison
equal deleted inserted replaced
5665:dd9dba7c1d00 5666:e5d91fd1f319
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 [1] 863 [240]
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