view tests/test-merge4.out @ 3036:77637938d43d

add document on command defaults
author TK Soh <teekaysoh@yahoo.com>
date Sat, 02 Sep 2006 20:24:53 +0800
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)