diff contrib/simplemerge @ 11329:390518de232e

tests: fix some branch head fallout
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Jun 2010 16:25:28 -0500
parents bb9f13974d8e
children 659f34b833b9
line wrap: on
line diff