D809: uncommit: add a test for uncommit with uncommitondirtywdir config in merge

[pulkit (Pulkit Goyal)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGae510d9691ef: uncommit: add a test for uncommit with uncommitondirtywdir config in merge (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D809?vs=2059&id=2064

REVISION DETAIL
  https://phab.mercurial-scm.org/D809

AFFECTED FILES
  tests/test-uncommit.t

CHANGE DETAILS

diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -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'



To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel