comparison mercurial/keepalive.py @ 3509: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 c4325f0a9b91
children 8520a773a141
comparison
equal deleted inserted replaced
3508:0aef94f45ebf 3509:9de0e64545a3