changeset 20034 | 1e5b38a919dd |
parent 17946 | 1e13b1184292 |
child 21790 | 3fbef7ac26f0 |
--- a/mercurial/mdiff.py Wed Nov 06 18:19:04 2013 -0500 +++ b/mercurial/mdiff.py Wed Nov 06 16:48:06 2013 -0500 @@ -6,8 +6,8 @@ # GNU General Public License version 2 or any later version. from i18n import _ -import bdiff, mpatch, util -import re, struct, base85, zlib +import bdiff, mpatch, util, base85 +import re, struct, zlib def splitnewlines(text): '''like str.splitlines, but only split on newlines.'''