annotate tests/test-merge4.out @ 1960:dac4bd67f6c5

update test for unrelated repo.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 14 Mar 2006 23:00:45 -0800
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source