diff contrib/simplemerge @ 21757:c00822e0b8ea

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jun 2014 11:56:20 -0500
parents 9de689d20230
children f18830651811
line wrap: on
line diff