annotate tests/test-merge4.out @ 1707:33d09f4a6fef

Put the empty line in commit text above the branch merge line.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 09 Feb 2006 07:14:05 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source