Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 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 f90337706ce7
children f254fc73d956
comparison
equal deleted inserted replaced
48874:af0b21d5a930 48875:6000f5b25c9b
3 # Copyright 2006, 2007, 2008 Olivia Mackall <olivia@selenic.com> 3 # Copyright 2006, 2007, 2008 Olivia Mackall <olivia@selenic.com>
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from __future__ import absolute_import
9 8
10 import contextlib 9 import contextlib
11 import os 10 import os
12 import re 11 import re
13 import shutil 12 import shutil