diff contrib/simplemerge @ 20818:c7d543eebe1a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Mar 2014 17:20:56 -0500
parents 9de689d20230
children f18830651811
line wrap: on
line diff