diff contrib/simplemerge @ 25195:472a685a4961

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 May 2015 07:17:57 -0500
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff