view tests/test-merge3.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 5a034646e472
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed