view tests/test-merge2.out @ 3709:38291d9c8c1c

Expand test-commit to cover one of the recent bugs.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Wed, 22 Nov 2006 00:53:56 +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