view tests/test-merge1.out @ 1088:39b916b1d8e4

updated manpage for new options of status
author TK Soh <teekaysoh@yahoo.com>
date Sat, 27 Aug 2005 12:00:12 -0700
parents 5a034646e472
children 67a28636ea64
line wrap: on
line source

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b