equal
deleted
inserted
replaced
12 from mercurial import util |
12 from mercurial import util |
13 import copy, cStringIO, errno, os, re, shutil, tempfile |
13 import copy, cStringIO, errno, os, re, shutil, tempfile |
14 |
14 |
15 cmdtable = {} |
15 cmdtable = {} |
16 command = cmdutil.command(cmdtable) |
16 command = cmdutil.command(cmdtable) |
|
17 testedwith = 'internal' |
17 |
18 |
18 lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
19 lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
19 |
20 |
20 diffopts = [ |
21 diffopts = [ |
21 ('w', 'ignore-all-space', False, |
22 ('w', 'ignore-all-space', False, |