comparison tests/test-pull-pull-corruption2.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 57729c56a23c
children
comparison
equal deleted inserted replaced
11451:51021f4c80b5 11452:eac141407b85