comparison tests/test-merge7.out @ 1612:0d36e3d7e2ea

Adjusted test output to match new hgignore error messages.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 07 Jan 2006 16:34:20 +0100
parents bf6c91cb816f
children 6d50d6189269
comparison
equal deleted inserted replaced
1611:301d5cd4abc6 1612:0d36e3d7e2ea