view tests/test-merge5.out @ 3934:d0bbd8ee50c7

Move test suite docs to the wiki
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Dec 2006 16:38:14 -0600
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes