tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 25 Aug 2005 02:00:03 -0700
changeset 1057 2fd15d743b3b
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Add grep command. It currently searches all revs of every matching file. I'll change this soon so that it can still do this, but it will not be the default behaviour. Many options are unimplemented. There's only one output mode. Binary files are not handled yet.

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