Mercurial > hg

diff contrib/simplemerge @ 48875:6000f5b25c9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py2: remove simple from __future__ statements These were needed for Python 2 support. Now that our linter no longer mandates these, we can start deleting them. Differential Revision: https://phab.mercurial-scm.org/D12254
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 03 Mar 2022 17:34:00 +0100
parents 7dad4665d223
children
line wrap: on
line diff
--- a/contrib/simplemerge	Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/simplemerge	Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import absolute_import
 
 import getopt
 import sys