diff tests/test-conflict.out @ 1960:dac4bd67f6c5

update test for unrelated repo.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 14 Mar 2006 23:00:45 -0800
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line diff