view tests/test-merge5.out @ 3493:e0db0b7934f2

hgweb: add heads to gitweb summary
author Brendan Cully <brendan@kublai.com>
date Tue, 24 Oct 2006 13:31:01 -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