Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/mdiff.py @ 127:44538462d3c8
Fix braindamaged import in mdiff.
author | mpm@selenic.com |
---|---|
date | Fri, 20 May 2005 19:19:25 -0800 |
parents | 8913e13196e1 |
children | e6c621a825f2 |
comparison
equal
deleted
inserted
replaced
126:f6d1f8a84372 | 127:44538462d3c8 |
---|---|
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 import difflib, struct, mmap, mpatchs | 2 import difflib, struct, mmap |
3 from mercurial.mpatch import * | |
3 | 4 |
4 def unidiff(a, ad, b, bd, fn): | 5 def unidiff(a, ad, b, bd, fn): |
5 if not a and not b: return "" | 6 if not a and not b: return "" |
6 a = a.splitlines(1) | 7 a = a.splitlines(1) |
7 b = b.splitlines(1) | 8 b = b.splitlines(1) |