diff contrib/simplemerge @ 13740:dcb51f156fa6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 12:38:36 -0500
parents bb9f13974d8e
children 659f34b833b9
line wrap: on
line diff