diff tests/test-conflict.out @ 7101:e786192d995d

convert: make built-in cvsps the default Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>
author Patrick Mezard <pmezard@gmail.com>
date Wed, 15 Oct 2008 20:14:28 +0200
parents 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line diff