Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-addremove.out @ 3506:9de0e64545a3
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 25 Oct 2006 02:51:27 -0300 |
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)