diff mercurial/templater.py @ 45917:721f765a34ac

errors: raise StateError on uncommitted changes when merge starts Differential Revision: https://phab.mercurial-scm.org/D9393
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 23:08:58 -0800
parents 18489e26d9a0
children 89a2afe31e82
line wrap: on
line diff