diff hg @ 22903:3d51e756b1ec

graft: use merge.graft
author Matt Mackall <mpm@selenic.com>
date Mon, 13 Oct 2014 17:12:31 -0500
parents 73e4a02e6d23
children 2ea9c9aa6e60
line wrap: on
line diff