view tests/test-grep.out @ 1883:b98160cfb2f3

give more info to hgmerge script.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 10 Mar 2006 23:34:02 -0800
parents fad2d091c74f
children 81f351c5264d
line wrap: on
line source

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