view tests/test-merge5.out @ 4452:862dc0c020ad

gitweb: Fixed manifest template opening an extra div tag
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Tue, 29 May 2007 03:27:02 -0400
parents fffc8a733bf9
children
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