diff contrib/simplemerge @ 24148:7a2194473155

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Feb 2015 17:46:03 -0600
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff