view tests/test-merge2.out @ 4655:120626e06409

update the output of test-help and test-globalopts
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 21 Jun 2007 00:34:14 -0300
parents b2ae81a7df29
children 4b0c9c674707
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