Mercurial > hg

view tests/test-merge5.out @ 5924:b8009718a211

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better error reporting for hg serve errors in tests
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Tue, 22 Jan 2008 09:11:11 +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