comparison tests/test-bookmarks @ 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 e581f3acc338
children 18c47562d331
comparison
equal deleted inserted replaced
11451:51021f4c80b5 11452:eac141407b85