Mercurial > evolve

comparison tests/test-stabilize-conflict.t @ 1600:0d8973818980 mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: register expected difference for Mercurial 3.5
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Feb 2016 11:07:44 +0000
parents c4f8a2916e43
children ad04f3c3b1a9
comparison
equal deleted inserted replaced
1599:dcf145d0ce21 1600:0d8973818980
125 1 new unstable changesets 125 1 new unstable changesets
126 $ hg evolve 126 $ hg evolve
127 move:[5] babar count up to fifteen 127 move:[5] babar count up to fifteen
128 atop:[7] babar count up to ten 128 atop:[7] babar count up to ten
129 merging babar 129 merging babar
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') 130 warning: conflicts during merge.
131 merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
131 evolve failed! 132 evolve failed!
132 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort 133 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
133 abort: unresolved merge conflicts (see hg help resolve) 134 abort: unresolved merge conflicts (see hg help resolve)
134 [255] 135 [255]
135 $ hg resolve -l 136 $ hg resolve -l