Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/patch.py @ 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 | 0e68608bd11d |
children | da3ee7ca620f |
comparison
equal
deleted
inserted
replaced
3505:0aef94f45ebf | 3506:9de0e64545a3 |
---|