Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-A3.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 31 Jan 2021 16:15:26 +0800 |
parents | 9f69164cdc16 669270305ccb |
children |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-A3.t Sun Jan 31 16:06:16 2021 +0800 +++ b/tests/test-exchange-obsmarkers-case-A3.t Sun Jan 31 16:15:26 2021 +0800 @@ -146,7 +146,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets e5ea8f9c7314 (1 drafts) + new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -268,7 +268,7 @@ 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets - new changesets e5ea8f9c7314 (1 drafts) + new changesets e5ea8f9c7314 (run 'hg heads' to see heads, 'hg merge' to merge) ## post pull state # obstore: main