view tests/test-revert-flags.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 d0dbae32517c
children
line wrap: on
line source

% reverting to rev 0
reverting foo
M foo
diff --git a/foo b/foo
old mode 100755
new mode 100644