view tests/test-push-validation.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 b26c4a89a143
children
line wrap: on
line source

adding alpha
adding beta
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to $HGTMP/test-push-validation/test
searching for changes
adding changesets
adding manifests
adding file changes
transaction abort!
rollback completed
abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify