crash trying to resolve merge conflicts
Created originally on Bitbucket by Anonymous
after a merge 3 files have conflicts. Trying to fix them gives a crash I have this problem in windows and in linux I have to kill the processes to continue
#!python
** Mercurial version (5.0.2). TortoiseHg version (5.0.2)
** Command: --nofork workbench
** CWD: X:\OneOs6\ws_1651\cp_switch_mngr
** Encoding: cp1252
** Extensions loaded: tortoisehg.util.configitems
** Python version: 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-5.9.2 PyQt-5.9.1 QScintilla-2.10.2.dev1711012104
Traceback (most recent call last):
File "tortoisehg\hgqt\status.pyo", line 444, in reloadComplete
File "tortoisehg\hgqt\status.pyo", line 474, in updateModel
File "mercurial\merge.pyo", line 153, in read
File "mercurial\merge.pyo", line 228, in _read
IndexError: list index out of range