Show More
@@ -3,9 +3,9 b'' | |||||
3 | from __future__ import absolute_import |
|
3 | from __future__ import absolute_import | |
4 |
|
4 | |||
5 | from mercurial import ( |
|
5 | from mercurial import ( | |
6 | filemerge, |
|
6 | error, | |
7 | extensions, |
|
7 | extensions, | |
8 | error, |
|
8 | filemerge, | |
9 | ) |
|
9 | ) | |
10 |
|
10 | |||
11 | def failfilemerge(filemergefn, |
|
11 | def failfilemerge(filemergefn, |
General Comments 0
You need to be logged in to leave comments.
Login now