| changeset 48875 | 6000f5b25c9b |
| parent 48432 | f45a4a47f6a8 |
| 48874:af0b21d5a930 | 48875:6000f5b25c9b |
|---|---|
1 # extension to emulate interrupting filemerge._filemerge |
1 # extension to emulate interrupting filemerge._filemerge |
2 |
2 |
3 from __future__ import absolute_import |
|
4 |
3 |
5 from mercurial import ( |
4 from mercurial import ( |
6 error, |
5 error, |
7 extensions, |
6 extensions, |
8 filemerge, |
7 filemerge, |