--- a/mercurial/extensions.py Sat Aug 05 05:25:36 2017 +0530
+++ b/mercurial/extensions.py Sun Aug 06 01:13:57 2017 +0900
@@ -250,6 +250,7 @@
from . import (
color,
commands,
+ filemerge,
fileset,
revset,
templatefilters,
@@ -268,6 +269,7 @@
('colortable', color, 'loadcolortable'),
('configtable', configitems, 'loadconfigtable'),
('filesetpredicate', fileset, 'loadpredicate'),
+ ('internalmerge', filemerge, 'loadinternalmerge'),
('revsetpredicate', revset, 'loadpredicate'),
('templatefilter', templatefilters, 'loadfilter'),
('templatefunc', templater, 'loadfunction'),