comparison contrib/memory.py @ 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 08a0f04b56bd
children 3e0d27d298b7
comparison
equal deleted inserted replaced
11451:51021f4c80b5 11452:eac141407b85