tests/test-grep.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Dec 2005 22:19:03 -0600
changeset 1581 db10b7114de0
parent 1148 fad2d091c74f
child 2868 81f351c5264d
permissions -rw-r--r--
abort when merging two heads and repository has local changes

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