Mercurial > public > mercurial-scm > hg-stable

comparison tests/test-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 12ac4401ff7d
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48592:c2537aec3bb6 48593:7ed4c4753891
44 ): 44 ):
45 raise error.Abort(b"don't know how to merge binary files") 45 raise error.Abort(b"don't know how to merge binary files")
46 simplemerge.Merge3Text.__init__( 46 simplemerge.Merge3Text.__init__(
47 self, basetext, atext, btext, base, a, b 47 self, basetext, atext, btext, base, a, b
48 ) 48 )
49
50
51 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
52 49
53 50
54 def split_lines(t): 51 def split_lines(t):
55 return util.stringio(t).readlines() 52 return util.stringio(t).readlines()
56 53