Mercurial > hg

view tests/test-merge5.out @ 5032:6dbd40b6307c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update expected test output It's no longer a "problem" to have the same name listed with no prefix and a "hgext." prefix.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 30 Jul 2007 20:48:50 -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