Mercurial > hg

view tests/test-merge5.out @ 5780:0ae953487255

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Obfuscate (instead of just escape) contact/owner in gitweb summary. This could contain an email address.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 01 Jan 2008 17:12:37 +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