Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/mdiff.py @ 3887:79e5a6e7c451
Merge with main
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 14 Dec 2006 13:49:33 -0800 |
parents | abaee83ce0a6 |
children | 226df1808f16 |
line wrap: on
line diff
--- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -5,9 +5,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -from demandload import demandload -import bdiff, mpatch -demandload(globals(), "re struct util") +import bdiff, mpatch, re, struct, util def splitnewlines(text): '''like str.splitlines, but only split on newlines.'''