Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4759:95cbb6b74790

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: activate subversion engine Fail gracefully if the subversion python bindings are not installed. Support --rev option to convert as well as URL@rev.
author Brendan Cully <brendan@kublai.com>
date Sun, 01 Jul 2007 20:30:04 -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