diff contrib/editmerge @ 21702:99db956b88ab

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jun 2014 16:01:01 -0700
parents 864c56cb8945
children 4b0fc75f9403
line wrap: on
line diff