Mercurial > evolve
diff tests/test-unstability-resolution-result.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | 7a5c6109ee84 |
| children | 79bc0f1a832e |
line wrap: on
line diff
--- a/tests/test-unstability-resolution-result.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-unstability-resolution-result.t Thu Apr 11 22:44:53 2019 +0200 @@ -36,7 +36,6 @@ (leaving bookmark changea) $ echo a >> a $ hg amend -m changea - 1 new orphan changesets $ hg evolve -v --confirm move:[2] changea atop:[3] changea @@ -84,7 +83,6 @@ [3] changea $ echo 'a' > a $ hg amend - 1 new orphan changesets $ hg evolve move:[4] newer a atop:[5] changea @@ -148,7 +146,6 @@ Make precursors public $ hg phase --hidden --public 1cf0aacfd363 - 1 new phase-divergent changesets $ glog @ 9:99c21c89bcef@default(draft) bk:[] newer a |