diff contrib/simplemerge @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents bb9f13974d8e
children 659f34b833b9
line wrap: on
line diff