diff tests/test-merge1.out @ 633:f597539c7abd

Slim down and update README a bit
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jul 2005 22:11:54 -0800
parents 5b22029b5aa2
children 7e4843b7efd2
line wrap: on
line diff