diff contrib/editmerge @ 21701:dedb68a9532c stable

Added signature for changeset 269c80ee5b3c
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jun 2014 14:15:43 -0700
parents 864c56cb8945
children 4b0fc75f9403
line wrap: on
line diff