diff Makefile @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
parents 11cd65611f3f
children 596ad02eabe4
line wrap: on
line diff