diff contrib/simplemerge @ 26504:875e5d89dc86

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 07 Oct 2015 13:44:48 -0500
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff