view tests/test-merge3.out @ 1383:3d6d45faf8b2

hg verify: add an error reporting helper function
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 10:51:02 -0700
parents 5a034646e472
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed