Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 3506:9de0e64545a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3505:0aef94f45ebf 3506:9de0e64545a3