Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-simplemerge.py
changeset 48565 7ed4c4753891
parent 48562 12ac4401ff7d
child 48875 6000f5b25c9b 
--- 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()
mercurial