view tests/test-merge5.out @ 3394:be628f1cd3f4

hgweb: really fix parent/child rename links
author Brendan Cully <brendan@kublai.com>
date Sat, 14 Oct 2006 16:20:22 -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