Mercurial > hg
annotate tests/test-conflict.out @ 1923:7d83a351a936
fix testsuite for freebsd and one timingissue
author | Peter van Dijk <peter@dataloss.nl> |
---|---|
date | Tue, 21 Feb 2006 22:23:51 +0100 |
parents | 5a034646e472 |
children | 7544700fd931 |
author | Peter van Dijk <peter@dataloss.nl> |
---|---|
date | Tue, 21 Feb 2006 22:23:51 +0100 |
parents | 5a034646e472 |
children | 7544700fd931 |