tests/test-uncommit.t

--- a/tests/test-uncommit.t	Sat Sep 16 02:34:13 2017 +0530
+++ b/tests/test-uncommit.t	Wed Sep 20 02:18:01 2017 +0530
@@ -149,6 +149,9 @@
   foo
   $ hg status
   M files
+  $ hg uncommit
+  abort: uncommitted changes
+  [255]
   $ hg uncommit files
   $ cat files
   abcde
@@ -337,7 +340,7 @@
   (branch merge, don't forget to commit)
 
   $ hg uncommit
-  abort: cannot uncommit while merging
+  abort: outstanding uncommitted merge
   [255]
 
   $ hg status