view tests/test-merge5.out @ 2686:d98eebc48d5e

[hgweb] Shortlog template for default theme
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Wed, 26 Jul 2006 20:26:52 -0400
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)