diff tests/test-conflict.out @ 3964:2308c39b9521

make it possible to use changectx to create a filectx
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 25 Dec 2006 17:43:44 +0100
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line diff