annotate tests/test-merge4.out @ 1623:eef8ff46567a

Added test for the currently broken addremove with the expected output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 17 Jan 2006 15:03:47 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source