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

%% Should show unknown
? unknown
removing b
%% Should show unknown and b removed
R b
? unknown
%% Should show a and unknown
a
unknown