diff contrib/editmerge @ 21830:0cc5187b95bc stable

Added tag 3.0.2 for changeset 2d8cd3d0e83c
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Jul 2014 23:32:11 -0500
parents 864c56cb8945
children 4b0fc75f9403
line wrap: on
line diff