##// END OF EJS Templates
tests: make test-simplemerge use absolute_import
Pulkit Goyal -
r28927:2d433fa7 default
parent child Browse files
Show More
@@ -61,7 +61,6 b''
61 tests/test-lrucachedict.py requires print_function
61 tests/test-lrucachedict.py requires print_function
62 tests/test-manifest.py not using absolute_import
62 tests/test-manifest.py not using absolute_import
63 tests/test-pathencode.py not using absolute_import
63 tests/test-pathencode.py not using absolute_import
64 tests/test-simplemerge.py not using absolute_import
65 tests/test-trusted.py requires print_function
64 tests/test-trusted.py requires print_function
66
65
67 #if py3exe
66 #if py3exe
@@ -13,10 +13,16 b''
13 # You should have received a copy of the GNU General Public License
13 # You should have received a copy of the GNU General Public License
14 # along with this program; if not, see <http://www.gnu.org/licenses/>.
14 # along with this program; if not, see <http://www.gnu.org/licenses/>.
15
15
16 from __future__ import absolute_import
17
16 import unittest
18 import unittest
17 from unittest import TestCase
19 from mercurial import (
18 from mercurial import util, simplemerge, error
20 error,
21 simplemerge,
22 util,
23 )
19
24
25 TestCase = unittest.TestCase
20 # bzr compatible interface, for the tests
26 # bzr compatible interface, for the tests
21 class Merge3(simplemerge.Merge3Text):
27 class Merge3(simplemerge.Merge3Text):
22 """3-way merge of texts.
28 """3-way merge of texts.
General Comments 0
You need to be logged in to leave comments. Login now