comparison hgmerge @ 2755:6c2c10cedf7a

Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help <extension> doesn't understand this form without this patch.
author Brendan Cully <brendan@kublai.com>
date Tue, 01 Aug 2006 14:56:54 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
2754:19041b8cbc86 2755:6c2c10cedf7a