diff contrib/simplemerge @ 10783:b9532264cb8b stable

Merge stable heads
author Matt Mackall <mpm@selenic.com>
date Mon, 29 Mar 2010 15:15:44 -0500
parents bb9f13974d8e
children 659f34b833b9
line wrap: on
line diff