Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5443:58496354773f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:40 -0500
parents fffc8a733bf9
children
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