tests/test-uncommit.t
branchstable
changeset 356 56d4c6207ef9
parent 318 da7509e7b50c
child 359 43f79983f638
--- a/tests/test-uncommit.t	Wed Jul 11 13:38:48 2012 +0200
+++ b/tests/test-uncommit.t	Wed Jul 11 13:59:02 2012 +0200
@@ -242,6 +242,7 @@
   Working directory parent is obsolete
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
+  2 new conflictings changesets
   $ hg st --copies
   A e
   $ hg st --copies --change .
@@ -285,6 +286,7 @@
   Working directory parent is obsolete
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
+  1 new conflictings changesets
   $ hg st --copies
   M b
   M d