# HG changeset patch # User Martin von Zweigbergk # Date 2022-01-14 16:44:36 # Node ID 7ed4c47538919c0f3819f7b802cb880d180b43cb # Parent c2537aec3bb6f91e9b08e956ac898a1e7345c14a 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 diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -27,10 +27,6 @@ from . import ( from .utils import stringutil -class CantReprocessAndShowBase(Exception): - pass - - def intersect(ra, rb): """Given two ranges return the range where they intersect or None. diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py --- a/tests/test-simplemerge.py +++ b/tests/test-simplemerge.py @@ -48,9 +48,6 @@ class Merge3(simplemerge.Merge3Text): ) -CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase - - def split_lines(t): return util.stringio(t).readlines()