view tests/test-merge5.out @ 5798:86f5d8f608b7

fetch: hide authentication details
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 04 Jan 2008 11:58:27 -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