Mercurial > hg-stable
diff tests/test-issue672.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 | 8abd9f785030 |
children | 4d504e541d3d |
line wrap: on
line diff
--- a/tests/test-issue672.t Sun Feb 28 23:21:28 2016 -0500 +++ b/tests/test-issue672.t Mon Feb 29 01:01:20 2016 -0500 @@ -65,6 +65,7 @@ branchmerge: True, force: False, partial: False ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 preserving 1a for resolve of 1a + starting 4 threads for background file closing (?) 1a: local copied/moved from 1 -> m (premerge) picked tool ':merge' for 1a (binary False symlink False changedelete False) merging 1a and 1 to 1a @@ -88,6 +89,7 @@ ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 preserving 1 for resolve of 1a removing 1 + starting 4 threads for background file closing (?) 1a: remote moved from 1 -> m (premerge) picked tool ':merge' for 1a (binary False symlink False changedelete False) merging 1 and 1a to 1a