# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1506262075 -19800
# Node ID ae510d9691efec90640d17fc61c56272c433fe95
# Parent  575097b4dce054a5b8d992fe15797d9d62ceaf71
uncommit: add a test for uncommit with uncommitondirtywdir config in merge

Differential Revision: https://phab.mercurial-scm.org/D809

diff -r 575097b4dce0 -r ae510d9691ef 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'