comparison tests/test-rebase-inmemory.t @ 46027:1d5189a57405 stable 5.6.1

rebase: clear merge state when aborting in-memory merge on dirty working copy

Differential Revision: https://phab.mercurial-scm.org/D9509

46026:39e2cf7cb120

  [255]
  $ cat a
  dirty
  $ hg status -v
  M a
  # The repository is in an unfinished *rebase* state.
  
  # To continue:    hg rebase --continue
  # To abort:       hg rebase --abort
  # To stop:        hg rebase --stop
  

Retrying without in-memory merge won't lose merge state
  $ cd ..
  $ hg clone repo3 repo3-merge-state -q
  $ cd repo3-merge-state

46027:1d5189a57405

  [255]
  $ cat a
  dirty
  $ hg status -v
  M a

Retrying without in-memory merge won't lose merge state
  $ cd ..
  $ hg clone repo3 repo3-merge-state -q
  $ cd repo3-merge-state