view tests/test-merge5.out @ 2927:ee6ed2b29e1a

Fix hgweb's patch display in changeset view.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 18 Aug 2006 13:06:38 +0200
parents 49988d9f0758
children 41989e55fa37
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