tests/test-rebase-conflicts.t

21266:19d6fec60b81

Conclude rebase:

  $ echo 'resolved merge' >common
  $ hg resolve -m common
  no unresolved files; you may continue your unfinished operation
  $ hg rebase --continue
  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

  $ hg tglog
  @  5:secret 'L3'  mybook

21267:e4f451c8c05c

Conclude rebase:

  $ echo 'resolved merge' >common
  $ hg resolve -m common
  no more unresolved files
  $ hg rebase --continue
  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

  $ hg tglog
  @  5:secret 'L3'  mybook