# HG changeset patch # User mpm@selenic.com # Date 1116645565 28800 # Node ID 44538462d3c83dfc968e62a8115c73f54691f7f7 # Parent f6d1f8a84372d8b0a6a6c1374da057458b00ad01 Fix braindamaged import in mdiff. diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -1,5 +1,6 @@ #!/usr/bin/python -import difflib, struct, mmap, mpatchs +import difflib, struct, mmap +from mercurial.mpatch import * def unidiff(a, ad, b, bd, fn): if not a and not b: return ""