Mercurial > public > mercurial-scm > hg
comparison mercurial/simplemerge.py @ 8312:b87a50b7125c
separate import lines from mercurial and general python modules
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Tue, 28 Apr 2009 17:40:46 +0200 |
| parents | bb9f13974d8e |
| children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
| 8311:e0eb03bfa5af | 8312:b87a50b7125c |
|---|---|
| 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): |