comparison hgmerge @ 1926:ba198d17eea9

changes by John Levon to standardize some erroroutput
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 15:57:43 +0100
parents 4ba8fe499df2
children 4eea6a747c27
comparison
equal deleted inserted replaced
1925:c71420b186b0 1926:ba198d17eea9