# HG changeset patch # User Martin von Zweigbergk # Date 1642178676 28800 # 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 -r c2537aec3bb6 -r 7ed4c4753891 mercurial/simplemerge.py --- a/mercurial/simplemerge.py Tue Jan 11 22:13:56 2022 -0800 +++ b/mercurial/simplemerge.py Fri Jan 14 08:44:36 2022 -0800 @@ -27,10 +27,6 @@ from .utils import stringutil -class CantReprocessAndShowBase(Exception): - pass - - def intersect(ra, rb): """Given two ranges return the range where they intersect or None. diff -r c2537aec3bb6 -r 7ed4c4753891 tests/test-simplemerge.py --- a/tests/test-simplemerge.py Tue Jan 11 22:13:56 2022 -0800 +++ b/tests/test-simplemerge.py Fri Jan 14 08:44:36 2022 -0800 @@ -48,9 +48,6 @@ ) -CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase - - def split_lines(t): return util.stringio(t).readlines()