changeset 48875 | 6000f5b25c9b |
parent 48565 | 7ed4c4753891 |
child 51686 | 493034cc3265 |
--- a/tests/test-simplemerge.py Sun Feb 20 15:18:15 2022 -0700 +++ b/tests/test-simplemerge.py Thu Mar 03 17:34:00 2022 +0100 @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. -from __future__ import absolute_import import unittest from mercurial import (