Mercurial > hg

view tests/test-merge5.out @ 5948:597d8402087d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge after backout
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 25 Jan 2008 16:04:46 -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