Mercurial > evolve

comparison tests/test-stabilize-result.t @ 3842:b293cce4ff55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: point to `hg help evolve.interrupted` while resolving content-div Recent test additions shows that --abort and --stop works well while resolving content-divergence and we should advertise them. This patch does so by pointing to evolve.interrupted help topic.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 12 Jun 2018 04:01:19 +0530
parents f67ac33c07d2
children f0096db2a7b1
comparison
equal deleted inserted replaced
3841:82b79a8dafd9 3842:b293cce4ff55
392 base: [12] More addition 392 base: [12] More addition
393 merging "other" content-divergent changeset 'f344982e63c4' 393 merging "other" content-divergent changeset 'f344982e63c4'
394 merging a 394 merging a
395 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 395 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
396 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 396 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
397 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort 397 abort: fix conflicts and see `hg help evolve.interrupted`
398 [255] 398 [255]
399 399
400 $ cat > a <<EOF 400 $ cat > a <<EOF
401 > jungle 401 > jungle
402 > a 402 > a