diff -r 49e7fbd66ef9 -r 4643a9ef7dd6 Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Fri May 30 11:39:39 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Fri May 30 11:53:20 2014 +0200
@@ -22,7 +22,7 @@
from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog
-import Utilities.mimetypes
+import Utilities.MimeTypes
class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog):
@@ -390,7 +390,7 @@
self.reMergeButton.setEnabled(unresolved > 0)
self.editButton.setEnabled(
selectedCount == 1 and
- Utilities.mimetypes.isTextFile(
+ Utilities.MimeTypes.isTextFile(
self.conflictsList.selectedItems()[0].data(
0, self.FilenameRole)))
@@ -442,5 +442,5 @@
"""
itm = self.conflictsList.selectedItems()[0]
filename = itm.data(0, self.FilenameRole)
- if Utilities.mimetypes.isTextFile(filename):
+ if Utilities.MimeTypes.isTextFile(filename):
e5App().getObject("ViewManager").getEditor(filename)
