diff tests/test-conflict.out @ 969:1d5b97537561

Minor README updates
author mpm@selenic.com
date Sat, 20 Aug 2005 00:49:41 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line diff