Can't resolve conflicts with med (TypeError: can only concatenate str (not "bytes") to str)
#!python
** Mercurial version (5.5). TortoiseHg version (unknown)
** Command:
** CWD: /home/abique/develop/bitwig/dev4
** Encoding: UTF-8
** Extensions loaded: extdiff, churn, fetch, graphlog, rebase, share, histedit, strip, keyword, eol, relink, purge, tortoisehg.util.configitems
** Python version: 3.8.5 (default, Jul 27 2020, 08:42:51) [GCC 10.1.0]
** System: Linux knot 5.7.12-zen1-1-zen #1 ZEN SMP PREEMPT Fri, 31 Jul 2020 17:38:26 +0000 x86_64
** Qt-5.15.0 PyQt-5.15.0 QScintilla-2.11.5
Traceback (most recent call last):
File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/resolve.py", line 465, in utreeDoubleClicked
self.merge()
File "/usr/lib/python3.8/site-packages/tortoisehg/hgqt/resolve.py", line 286, in merge
cmd += ['--tool='+tool]
TypeError: can only concatenate str (not "bytes") to str
I use tortoisehg 5.5 from AUR (archlinux).