comparison hgweb.cgi @ 45493:2c10876bb320

mergestate: make clean() only be about creating a clean mergestate This is similar to the previous patch, but moves the separation one step further out, to `merge.py`. Differential Revision: https://phab.mercurial-scm.org/D9034
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Sep 2020 09:23:21 -0700
parents d58a205d0672
children c102b704edb5
comparison
equal deleted inserted replaced
45492:08c6d6962b2a 45493:2c10876bb320