changeset 39478 | c4a7ba10cdd7 |
parent 39196 | 8c6775e812d8 |
child 39577 | cb1329738d64 |
--- a/tests/test-merge1.t Fri Sep 07 14:48:38 2018 -0700 +++ b/tests/test-merge1.t Fri Sep 07 23:39:49 2018 -0400 @@ -30,7 +30,8 @@ $ mkdir b && touch b/nonempty $ hg up - abort: Directory not empty: '$TESTTMP/t/b' + abort: Unlinking directory not permitted: '$TESTTMP/t/b' (windows !) + abort: Directory not empty: '$TESTTMP/t/b' (no-windows !) [255] $ hg ci abort: last update was interrupted