view tests/test-merge5.out @ 3900:2b3175acb653

Don't use node length for calculating revision number length. Done by moving repo.lookup of revisions from commands.export to patch.export
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 15 Dec 2006 19:30:20 +0100
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