annotate tests/test-merge4.out @ 1198:66f7d3946109

Add test output.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 03 Sep 2005 23:52:39 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source