Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Tue Oct 18 16:06:21 2022 +0200
@@ -18,11 +18,11 @@
     QWidget,
 )
 
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricApplication import ericApp
 
 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog
 
-import Utilities.MimeTypes
+from eric7.Utilities import MimeTypes
 
 
 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog):
@@ -244,7 +244,7 @@
         self.reMergeButton.setEnabled(unresolved > 0)
         self.editButton.setEnabled(
             selectedCount == 1
-            and Utilities.MimeTypes.isTextFile(
+            and MimeTypes.isTextFile(
                 self.conflictsList.selectedItems()[0].data(0, self.FilenameRole)
             )
         )
@@ -297,5 +297,5 @@
         """
         itm = self.conflictsList.selectedItems()[0]
         filename = itm.data(0, self.FilenameRole)
-        if Utilities.MimeTypes.isTextFile(filename):
+        if MimeTypes.isTextFile(filename):
             ericApp().getObject("ViewManager").getEditor(filename)