Show More
@@ -5,11 +5,25 b'' | |||
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 |
from |
|
|
9 | from i18n import _ | |
|
10 | import util, simplemerge, match, error, templater, templatekw | |
|
11 | import os, tempfile, re, filecmp | |
|
12 |
import |
|
|
8 | from __future__ import absolute_import | |
|
9 | ||
|
10 | import filecmp | |
|
11 | import os | |
|
12 | import re | |
|
13 | import tempfile | |
|
14 | ||
|
15 | from .i18n import _ | |
|
16 | from .node import short | |
|
17 | ||
|
18 | from . import ( | |
|
19 | error, | |
|
20 | match, | |
|
21 | simplemerge, | |
|
22 | tagmerge, | |
|
23 | templatekw, | |
|
24 | templater, | |
|
25 | util, | |
|
26 | ) | |
|
13 | 27 | |
|
14 | 28 | def _toolstr(ui, tool, part, default=""): |
|
15 | 29 | return ui.config("merge-tools", tool + "." + part, default) |
General Comments 0
You need to be logged in to leave comments.
Login now