Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4515:86a66cce9566

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 06 Jun 2007 20:17:03 +0200
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