tests/test-merge5.out
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Tue, 29 May 2007 03:27:02 -0400
changeset 4452 862dc0c020ad
parent 3592 fffc8a733bf9
permissions -rw-r--r--
gitweb: Fixed manifest template opening an extra div tag

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