diff tests/test-conflict @ 2487:041363739ca8

Test case for #294
author Brendan Cully <brendan@kublai.com>
date Fri, 23 Jun 2006 08:10:06 +0200
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff