equal
deleted
inserted
replaced
17 |
17 |
18 # mbp: "you know that thing where cvs gives you conflict markers?" |
18 # mbp: "you know that thing where cvs gives you conflict markers?" |
19 # s: "i hate that." |
19 # s: "i hate that." |
20 |
20 |
21 from i18n import _ |
21 from i18n import _ |
22 import util, mdiff, sys, os |
22 import util, mdiff |
|
23 import sys, os |
23 |
24 |
24 class CantReprocessAndShowBase(Exception): |
25 class CantReprocessAndShowBase(Exception): |
25 pass |
26 pass |
26 |
27 |
27 def intersect(ra, rb): |
28 def intersect(ra, rb): |