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 |
18 import unittest |
17 import unittest |
19 from mercurial import ( |
18 from mercurial import ( |
20 error, |
19 error, |
21 simplemerge, |
20 simplemerge, |