diff contrib/simplemerge @ 13210:86a218df3c2b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Dec 2010 11:18:27 -0600
parents bb9f13974d8e
children 659f34b833b9
line wrap: on
line diff