Mercurial > evolve

comparison tests/test-evolve-orphan-merge.t @ 3821:f67ac33c07d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted `evolve.interrupted-evolve` has the word evolve twice. Now that this help topic is a part of evolve command, evolve.interrupted will mean the interrupted evolve command only.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 01:12:12 +0530
parents ededd22e7c7b
children f0096db2a7b1
comparison
equal deleted inserted replaced
3811:3273b178c202 3821:f67ac33c07d2
218 move:[10] foobar to c 218 move:[10] foobar to c
219 atop:[11] foo to c 219 atop:[11] foo to c
220 merging c 220 merging c
221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
222 evolve failed! 222 evolve failed!
223 see `hg help evolve.interrupted-evolve` 223 see `hg help evolve.interrupted`
224 abort: unresolved merge conflicts (see hg help resolve) 224 abort: unresolved merge conflicts (see hg help resolve)
225 [255] 225 [255]
226 226
227 $ echo FOObar > c 227 $ echo FOObar > c
228 $ hg resolve -m 228 $ hg resolve -m
275 move:[12] foobar to c 275 move:[12] foobar to c
276 atop:[13] foo to c 276 atop:[13] foo to c
277 merging c 277 merging c
278 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 278 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
279 evolve failed! 279 evolve failed!
280 see `hg help evolve.interrupted-evolve` 280 see `hg help evolve.interrupted`
281 abort: unresolved merge conflicts (see hg help resolve) 281 abort: unresolved merge conflicts (see hg help resolve)
282 [255] 282 [255]
283 283
284 $ echo foobar > c 284 $ echo foobar > c
285 $ hg resolve -m 285 $ hg resolve -m