view tests/test-revert-flags.t @ 44438:f0021fbedea9

cleanup: remove redundant clearing of mergestate in rebase and shelve

`repo.commit()` now clears the merge state even if it ends up not
creating a commit because there were no changes to commit.

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

#require execbit

  $ hg init repo
  $ cd repo
  $ echo foo > foo
  $ chmod 644 foo
  $ hg ci -qAm '644'

  $ chmod 755 foo
  $ hg ci -qAm '755'

reverting to rev 0

  $ hg revert -a -r 0
  reverting foo
  $ hg st
  M foo
  $ hg diff --git
  diff --git a/foo b/foo
  old mode 100755
  new mode 100644

  $ cd ..