tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 01 Aug 2007 10:42:42 +0200
changeset 5040 4f34d9b2568e
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Update style of record's cmdtable to match mercurial/commands.py

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