diff tests/test-merge-default.out @ 3942:1158d7018052

Move README info to wiki
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Dec 2006 17:17:08 -0600
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff