view tests/test-merge5.out @ 4512:91709ba3cc88

Move convert-repo to hgext/convert/__init__.py
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 06 Jun 2007 19:49:47 +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