Mercurial > hg
diff tests/test-up-local-change.t @ 28318:564a354f7f35
tests: flag Windows specific lines about background closing as optional
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 29 Feb 2016 01:01:20 -0500 |
parents | 6b1fc09c699a |
children | 35861cc1076e |
line wrap: on
line diff
--- a/tests/test-up-local-change.t Sun Feb 28 23:21:28 2016 -0500 +++ b/tests/test-up-local-change.t Mon Feb 29 01:01:20 2016 -0500 @@ -73,6 +73,7 @@ preserving a for resolve of a b: other deleted -> r removing b + starting 4 threads for background file closing (?) a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False changedelete False) merging a