diff contrib/simplemerge @ 19750:d4ed26beae0e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Sep 2013 14:52:16 -0500
parents 9de689d20230
children f18830651811
line wrap: on
line diff