[Commented On] D8930: mergestate: clear merge state if there are no unresolved conflicts
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Wed Aug 26 16:33:06 UTC 2020
marmoute added a comment.
The ability to re-run the merge seems quite important and I fear the BC implication. What are the issue with keeping the file around? The one issue I see listed is the use of % in `hg log` could we tackle that directly instead?
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8930/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8930
To: martinvonz, #hg-reviewers
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200826/32b17085/attachment-0002.html>
More information about the Mercurial-patches
mailing list