Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Fri Aug 25 16:14:48 2017 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sat Aug 26 16:49:16 2017 +0200
@@ -22,6 +22,7 @@
 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog
 
 import Utilities.MimeTypes
+from Globals import strToQByteArray
 
 
 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog):
@@ -336,7 +337,7 @@
             self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(inputTxt)
+        self.process.write(strToQByteArray(inputTxt))
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()