Mercurial > hg

view tests/test-merge5.out @ 5998:5d91f6e6f841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarify help for hg status and make it consistent.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 02 Feb 2008 14:49:31 +0100
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