view tests/test-rebuildstate.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 ffeb926d57ce
children
line wrap: on
line source

adding bar
adding foo
% state dump after
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo