view tests/test-merge2.out @ 3942:1158d7018052

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

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b