log mercurial/mergeutil.py @ 45916:fa87536d3d70

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