view tests/test-merge5.out @ 3167:833f2d1fc508

hgweb: fix annotate bugs The parent and child links were broken.
author Brendan Cully <brendan@kublai.com>
date Wed, 27 Sep 2006 09:10:29 -0700
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