Commits

Anonymous committed 284ac2c

rejects: earlybytes fix (fixes #2295)

Comments (0)

Files changed (1)

tortoisehg/hgqt/rejects.py

             self.hide()
             QTimer.singleShot(0, self.reject)
             return
-        earlybytes = f.readData(4096)
+        earlybytes = f.read(4096)
         if '\0' in earlybytes:
             qtlib.ErrorMsgBox(_('Unable to merge rejects'),
                               _('This appears to be a binary file'))