Mercurial > hg > mercurial-crew

view tests/test-merge5.out @ 4675:6858a7477a5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change branches to sort 'active' branches first, and add an option to show only active branches.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 21 Jun 2007 10:40:09 -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