view tests/test-merge4.out @ 2416:04736f38d74f

make description of -n option better.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 09 Jun 2006 09:09:17 -0700
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)