Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/simplemerge.py @ 48593:7ed4c4753891

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: delete unused exception class `CantReprocessAndShowBase` The only user was removed in f18830651811 (simplemerge: burn "minimal" feature to the ground, 2014-08-05). Differential Revision: https://phab.mercurial-scm.org/D11998
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 14 Jan 2022 08:44:36 -0800
parents c2537aec3bb6
children 50de08904c63
comparison
equal deleted inserted replaced
48592:c2537aec3bb6 48593:7ed4c4753891
23 error, 23 error,
24 mdiff, 24 mdiff,
25 pycompat, 25 pycompat,
26 ) 26 )
27 from .utils import stringutil 27 from .utils import stringutil
28
29
30 class CantReprocessAndShowBase(Exception):
31 pass
32 28
33 29
34 def intersect(ra, rb): 30 def intersect(ra, rb):
35 """Given two ranges return the range where they intersect or None. 31 """Given two ranges return the range where they intersect or None.
36 32