tests/test-uncommit.t

--- a/tests/test-uncommit.t	Thu Sep 14 13:14:32 2017 -0700
+++ b/tests/test-uncommit.t	Sun Sep 24 19:37:55 2017 +0530
@@ -354,6 +354,10 @@
   abort: outstanding uncommitted merge
   [255]
 
+  $ hg uncommit --config experimental.uncommitondirtywdir=True
+  abort: cannot uncommit while merging
+  [255]
+
   $ hg status
   M a
   $ hg commit -m 'merge a and b'