Mercurial > evolve

comparison tests/test-unstability-resolution-result.t @ 4576:96ce1030d2fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --update to hg evolve to reduce test changes for the next patch
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Apr 2019 02:18:19 +0800
parents 7a5c6109ee84
children 79bc0f1a832e b6c819facbe8
comparison
equal deleted inserted replaced
4575:903e8b983fac 4576:96ce1030d2fb
83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 [3] changea 84 [3] changea
85 $ echo 'a' > a 85 $ echo 'a' > a
86 $ hg amend 86 $ hg amend
87 1 new orphan changesets 87 1 new orphan changesets
88 $ hg evolve 88 $ hg evolve --update
89 move:[4] newer a 89 move:[4] newer a
90 atop:[5] changea 90 atop:[5] changea
91 merging a 91 merging a
92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
93 fix conflicts and see `hg help evolve.interrupted` 93 fix conflicts and see `hg help evolve.interrupted`