view tests/test-merge5.out @ 5273:6e0f05f6f68d

hgweb: Show date of last change for each file in manifest
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 31 Aug 2007 11:18:29 +0200
parents fffc8a733bf9
children 4b0c9c674707
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