diff tests/test-histedit-no-change.t @ 22895:dfa44e25bb53

dirstate: properly clean-up some more merge state on setparents

--- a/tests/test-histedit-no-change.t	Tue Oct 07 11:42:37 2014 -0700
+++ b/tests/test-histedit-no-change.t	Fri Oct 10 13:05:50 2014 -0500
@@ -181,7 +181,7 @@
   parent: 0:cb9a9f314b8b 
    a
   branch: default
-  commit: 1 modified, 1 unknown (new branch head)
+  commit: 1 added, 1 unknown (new branch head)
   update: 6 new changesets (update)
   hist:   2 remaining (histedit --continue)
 
@@ -190,7 +190,7 @@
 
 modified files should survive the abort when we've moved away already
   $ hg st
-  M e
+  A e
   ? edit.sh
 
   $ graphlog "log after abort"