Mercurial Mercurial > hg-stable / 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/failfilemerge.py
changeset 48966 6000f5b25c9b
parent 48477 f45a4a47f6a8 
--- a/tests/failfilemerge.py	Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/failfilemerge.py	Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
 # extension to emulate interrupting filemerge._filemerge
 
-from __future__ import absolute_import
 
 from mercurial import (
     error,
hg-stable