log tests/test-up-local-change.out @ 2583:6e5427447f4c

age author description
Mon, 03 Jul 2006 19:28:31 +0200 Thomas Arendsen Hein Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)