equal
deleted
inserted
replaced
11 # GNU General Public License for more details. |
11 # GNU General Public License for more details. |
12 # |
12 # |
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, |
19 |
21 simplemerge, |
|
22 util, |
|
23 ) |
|
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. |
23 |
29 |
24 Given BASE, OTHER, THIS, tries to produce a combined text |
30 Given BASE, OTHER, THIS, tries to produce a combined text |