Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5010:6b2d8caf87b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert svn: try to extract URL from source if it is a working directory
author Brendan Cully <brendan@kublai.com>
date Thu, 26 Jul 2007 10:57:26 -0700
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