Mercurial > hg
diff tests/test-uncommit.t @ 34304:ae510d9691ef
uncommit: add a test for uncommit with uncommitondirtywdir config in merge
Differential Revision: https://phab.mercurial-scm.org/D809
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 24 Sep 2017 19:37:55 +0530 |
| parents | 7b1e524ad73f |
| children | 1644623ab096 |
line wrap: on
line diff
--- 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'