Mercurial > hg
view tests/test-addremove.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 | 03916abdfb64 |
children | 627399330c7d |
line wrap: on
line source
adding dir/bar adding foo dir/bar foo committed changeset 0:d44511117907 adding dir/bar_2 adding foo_2 dir/bar_2 foo_2 committed changeset 1:a85812e0561a adding a adding c removing a adding b removing c adding d recording removal of a as rename to b (100% similar)