view tests/test-merge5.out @ 4725:cf8b8f62688a

Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jun 2007 21:23:24 -0500
parents fffc8a733bf9
children 4b0c9c674707
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