view tests/test-merge5.out @ 4073:95ffa36d1d2a

BeOS compatibility support
author Andrew Bachmann <andrewbachmann@gmail.com>
date Tue, 02 Jan 2007 21:40:20 -0800
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