tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 09 Jun 2007 13:17:58 +0200
changeset 4532 c3a78a49d7f0
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Some small cleanups for convert extension: - repo doesn't need to be imported - util.Abort doesn't need \n - space after comma - long lines - spacing

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