345 

   345 

   346 Try to make empty commit while there are conflicts

   346 Try to make empty commit while there are conflicts

   347   $ hg revert -r . a

   347   $ hg revert -r . a

   348   $ rm a.orig

   348   $ rm a.orig

   349   $ hg ci -m empty

   349   $ hg ci -m empty

   352   $ hg resolve -m a

   352   $ hg resolve -m a

   353   (no more unresolved files)

   353   (no more unresolved files)

   354   $ hg resolve -l

   354   $ hg resolve -l

   355   R a

   355   R a

   356   $ hg ci -m empty

   356   $ hg ci -m empty