diff tests/test-merge1.out @ 3506:da9506fe2710

Remove some old documentation that belongs on the wiki
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Oct 2006 16:25:44 -0500
parents d2b55e3c4e25
children 3109f012c305
line wrap: on
line diff