Mercurial > evolve

comparison tests/test-evolve-progress.t @ 6175:d03f682938ae mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset cb5e056048d0 CORE-TEST-OUTPUT-UPDATE: 6b1049d71c3e
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 07:13:41 +0300
parents bd2c42680dff
children 32faf1cd209f
comparison
equal deleted inserted replaced
6174:bd2c42680dff 6175:d03f682938ae
127 a: versions differ -> m 127 a: versions differ -> m
128 updating: a 1/1 files (100.00%) 128 updating: a 1/1 files (100.00%)
129 picked tool ':merge' for a (binary False symlink False changedelete False) 129 picked tool ':merge' for a (binary False symlink False changedelete False)
130 merging a 130 merging a
131 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b 131 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
132 picked tool ':merge' for a (binary False symlink False changedelete False)
133 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
132 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 134 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
133 unresolved merge conflicts 135 unresolved merge conflicts
134 (see 'hg help evolve.interrupted') 136 (see 'hg help evolve.interrupted')
135 [240] 137 [240]
136 $ echo resolved > a 138 $ echo resolved > a