equal
deleted
inserted
replaced
3 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
3 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
4 # |
4 # |
5 # This software may be used and distributed according to the terms |
5 # This software may be used and distributed according to the terms |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # of the GNU General Public License, incorporated herein by reference. |
7 |
7 |
8 import difflib, struct, mmap |
8 import difflib, struct |
9 from mercurial.mpatch import * |
9 from mercurial.mpatch import * |
10 |
10 |
11 def unidiff(a, ad, b, bd, fn): |
11 def unidiff(a, ad, b, bd, fn): |
12 if not a and not b: return "" |
12 if not a and not b: return "" |
13 a = a.splitlines(1) |
13 a = a.splitlines(1) |