tests/test-merge3.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:28:31 +0200
changeset 2552 bb403d427974
parent 1747 91c56c427171
permissions -rw-r--r--
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)

removing b
nothing changed