annotate tests/test-merge4.out @ 1499:874efc57e00a

Fixed wrong encoding of files.
author Hidetaka Iwai <tyuyu@debian.or.jp>
date Thu, 03 Nov 2005 11:54:07 +0900
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source