view tests/test-merge4.out @ 2573:82e3b2966862

Fix annotate breakage
author Matt Mackall <mpm@selenic.com>
date Thu, 06 Jul 2006 14:15:24 -0500
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)