diff tests/test-merge3.out @ 10760:bdb60057f905 stable

test-convert-cvs: filter unstable cvs output. The order choosen by cvs to display commit is not stable when the tests are run under heavy CPU/IO load. This leads to irrelevant failures of the test suite. This changeset filters four lines impacted by this instability. The result of the conversion is still verified.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 22 Mar 2010 22:19:40 +0100
parents 91c56c427171
children
line wrap: on
line diff