tests/test-prev-next.t
branchstable
changeset 3781 e73a73b27f3e
parent 3780 9da11755d615
child 3782 27cf636b2f4d
--- a/tests/test-prev-next.t	Sun Jun 03 02:50:55 2018 +0530
+++ b/tests/test-prev-next.t	Sun Jun 03 02:36:24 2018 +0530
@@ -397,11 +397,10 @@
 
   $ echo bar > wat
   $ hg prev
-  abort: uncommitted changes
-  (do you want --merge?)
-  [255]
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  [1] added foo
   $ hg diff
-  diff -r ac3de1218820 wat
+  diff -r cf959ce4e1ff wat
   --- a/wat	Thu Jan 01 00:00:00 1970 +0000
   +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -410,10 +409,6 @@
 
 testing for `hg next`
 
-  $ echo hi > wat
-  $ hg up .^
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ echo bar > wat
   $ hg next
   abort: uncommitted changes
   (do you want --merge?)