view tests/test-rebuildstate.out @ 5340:ad8783fe20f7

darcs2hg: Now detects and recovers from simple darcs conflicts.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:13:54 -0400
parents b304c2496f52
children 79373ec3f27d
line wrap: on
line source

adding bar
adding foo
% state dump
a 644          0 baz
n 644          0 foo
r   0          0 bar
% status
A baz
R bar
C foo
% state dump
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo