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

port:4:export
port:4:vaportight
port:4:import/export
FIXME: history is wrong here
port:1:1:-:eggs:import
port:1:2:+:eggs:vaportight
port:1:3:+:eggs:import/export
port:0:2:+:spam:export
port:0:1:+:spam:import
port:4:import/export