Mercurial > hg
diff mercurial/simplemerge.py @ 48303:2ce31dbde4b1
backout: backed out changeset f78d8b8c46d7
This and the following backout exist because the original patches break the
Windows CI for some yet unknown reason.
Differential Revision: https://phab.mercurial-scm.org/D11726
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Wed, 27 Oct 2021 12:07:58 +0200 |
parents | 728d89f6f9b1 |
children | 9e1f174d305b |