tests/test-absorb-unfinished.t
changeset 45826 21733e8c924f
parent 45771 f90a5c211251
child 45840 527ce85c2e60
equal deleted inserted replaced
45825:8f07f5a9c3de 45826:21733e8c924f
    19   $ hg --config extensions.rebase= rebase -r 1 -d 0
    19   $ hg --config extensions.rebase= rebase -r 1 -d 0
    20   rebasing 1:c3b6dc0e177a tip "foo 2"
    20   rebasing 1:c3b6dc0e177a tip "foo 2"
    21   merging foo.whole
    21   merging foo.whole
    22   warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
    22   warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
    23   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
    23   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
    24   [1]
    24   [240]
    25 
    25 
    26   $ hg --config extensions.rebase= absorb
    26   $ hg --config extensions.rebase= absorb
    27   abort: rebase in progress
    27   abort: rebase in progress
    28   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
    28   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
    29   [255]
    29   [255]