Mercurial > hg

view tests/test-merge5.out @ 6233:14a4fdf9037f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 11 Mar 2008 16:04:25 -0700
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