view tests/test-rebuildstate.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
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