branch | stable |
changeset 35821 | 7b2b82f891bf |
parent 35741 | 73432eee0ac4 |
child 36066 | f6a8a81f4f7b |
--- a/tests/test-fileset.t Thu Feb 01 14:13:41 2018 -0500 +++ b/tests/test-fileset.t Tue Feb 06 23:53:37 2018 -0500 @@ -249,6 +249,8 @@ Test merge states $ hg ci -m manychanges + $ hg file -r . 'set:copied() & modified()' + [1] $ hg up -C 0 * files updated, 0 files merged, * files removed, 0 files unresolved (glob) $ echo c >> b2