comparison tests/test-simple-update.out @ 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 a3d73b3e1f8a
children
comparison
equal deleted inserted replaced
11451:51021f4c80b5 11452:eac141407b85