Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4520:ce1fed4a5b94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hgext/convert/__init__.py rights
author Edouard Gomez <ed.gomez@free.fr>
date Thu, 07 Jun 2007 23:06:17 +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