equal
deleted
inserted
replaced
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, write to the Free Software |
14 # along with this program; if not, write to the Free Software |
15 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
16 |
16 |
17 import os |
|
18 import unittest |
17 import unittest |
19 from unittest import TestCase |
18 from unittest import TestCase |
20 import imp |
|
21 import shutil |
|
22 from mercurial import util, simplemerge |
19 from mercurial import util, simplemerge |
23 |
20 |
24 # bzr compatible interface, for the tests |
21 # bzr compatible interface, for the tests |
25 class Merge3(simplemerge.Merge3Text): |
22 class Merge3(simplemerge.Merge3Text): |
26 """3-way merge of texts. |
23 """3-way merge of texts. |