view tests/test-merge2.out @ 4639:c7371aa0c153

test-annotate: add a test for issue 589.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 20 Jun 2007 00:10:21 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b