diff mercurial/util.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 8b55c0ba8048
children bb44489b901f 3b07e223534b
line wrap: on
line diff