tests/test-rebase-conflicts.t
changeset 45916 fa87536d3d70
parent 45840 527ce85c2e60
child 46372 3e91d9978bec
child 46679 d6fa9fbd375d
equal deleted inserted replaced
45915:8f50dc096cf4 45916:fa87536d3d70
    87 
    87 
    88 Try to continue without solving the conflict:
    88 Try to continue without solving the conflict:
    89 
    89 
    90   $ hg rebase --continue
    90   $ hg rebase --continue
    91   abort: unresolved merge conflicts (see 'hg help resolve')
    91   abort: unresolved merge conflicts (see 'hg help resolve')
    92   [255]
    92   [20]
    93 
    93 
    94 Conclude rebase:
    94 Conclude rebase:
    95 
    95 
    96   $ echo 'resolved merge' >common
    96   $ echo 'resolved merge' >common
    97   $ hg resolve -m common
    97   $ hg resolve -m common