parse error at hgsub after merge conflict
Created originally on Bitbucket by NN
Error string "<<<<<<< local" at .hgsub:6 Please edit your config
If you still have trouble, please file a bug report.
#!python
** Mercurial version (3.7.1). TortoiseHg version (3.7.1)
** Command:
** CWD: C:\Program Files\TortoiseHg
** Encoding: cp1252
** Extensions loaded: extdiff, histedit, mercurial_keyring, purge, rebase, shelve, strip, reviewboard, flow
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\merge.pyo", line 363, in isComplete
File "tortoisehg\hgqt\thgrepo.pyo", line 1031, in recursiveMergeStatus
File "mercurial\util.pyo", line 723, in __get__
File "mercurial\context.pyo", line 168, in substate
File "mercurial\subrepo.pyo", line 101, in state
File "mercurial\subrepo.pyo", line 96, in read
File "mercurial\config.pyo", line 168, in parse
ParseError: ('<<<<<<< local', '.hgsub:6')
Traceback (most recent call last):
File "tortoisehg\hgqt\merge.pyo", line 363, in isComplete
File "tortoisehg\hgqt\thgrepo.pyo", line 1031, in recursiveMergeStatus
File "mercurial\util.pyo", line 723, in __get__
File "mercurial\context.pyo", line 168, in substate
File "mercurial\subrepo.pyo", line 101, in state
File "mercurial\subrepo.pyo", line 96, in read
File "mercurial\config.pyo", line 168, in parse
ParseError: ('<<<<<<< local', '.hgsub:6')