Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-revert-unknown.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 | a514c7509fa9 |
children |
line wrap: on
line source
%% Should show unknown ? unknown removing b %% Should show unknown and b removed R b ? unknown %% Should show a and unknown a unknown