log mercurial/mergeutil.py @ 46244:fb69b51b4daa

age author description
Mon, 23 Nov 2020 16:48:13 -0800 Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts