Mercurial Repositories > eric / file diff

diff -r 5798ee4a8807 -r 3f23dbf37dbe src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,22 +8,21 @@
 conflicts.
 """
 
-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
     QAbstractButton,
+    QApplication,
     QDialogButtonBox,
     QHeaderView,
     QTreeWidgetItem,
-    QApplication,
     QWidget,
 )
 
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Utilities import MimeTypes
 
 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog
 
-from eric7.Utilities import MimeTypes
-
 
 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog):
     """