view tests/test-merge5.out @ 3222:3bd3a98b4921

Fix gitweb index archive link
author Brendan Cully <brendan@kublai.com>
date Mon, 02 Oct 2006 09:58:03 -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