diff mercurial/dirstate.py @ 4796:83c1bbb934ec

convert: svn merges produce hard-to-trace file entries. Ignore them for now.
author Brendan Cully <brendan@kublai.com>
date Tue, 03 Jul 2007 19:49:36 -0700
parents de8ec7e1753a
children a11921d24ec4 81078e177266
line wrap: on
line diff