Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-addremove.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 | ff3ea21a981a |
children |
line wrap: on
line source
adding dir/bar adding foo dir/bar foo adding dir/bar_2 adding foo_2 dir/bar_2 foo_2 adding a adding c adding b adding d removing a removing c recording removal of a as rename to b (100% similar)