merge conflict 3way-diff crash dump
have file that was was moved in main branch. and a new merge (with old path) produce conflicts.
try to show 3way-diff gives this crash:
#!python
** Mercurial version (5.4.1). TortoiseHg version (5.4.1)
** Command: --nofork workbench
** CWD: D:\projects\contiki.hggit
** Encoding: cp1251
** Extensions loaded: convert, eol, strip, mq, rebase, record, transplant, highlight, show, split, commitextras, fix, uncommit, share, hggit, censor, histedit, narrow, tortoisehg.util.configitems
** Python version: 2.7.17 (v2.7.17:c2f86d86e6, Oct 19 2019, 21:01:17) [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.9 PyQt-5.13.2 QScintilla-2.10.8
Traceback (most recent call last):
File "tortoisehg\hgqt\resolve.pyo", line 326, in v3way
File "tortoisehg\hgqt\visdiff.pyo", line 290, in visualdiff
AttributeError: 'branch_copies' object has no attribute 'keys'