diff -r f99d64e8a4e4 -r f0b6fbea00cf mercurial/filemerge.py
--- a/mercurial/filemerge.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/mercurial/filemerge.py	Thu Mar 22 21:56:20 2018 +0900
@@ -31,6 +31,10 @@
     util,
 )
 
+from .utils import (
+    stringutil,
+)
+
 def _toolstr(ui, tool, part, *args):
     return ui.config("merge-tools", tool + "." + part, *args)
 
@@ -573,7 +577,7 @@
         mark = mark.splitlines()[0] # split for safety
 
     # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
-    return util.ellipsis(mark, 80 - 8)
+    return stringutil.ellipsis(mark, 80 - 8)
 
 _defaultconflictlabels = ['local', 'other']