Mercurial > hg
diff contrib/genosxversion.py @ 47766:3feda1e779d4 stable
fix: rewrite writeworkingdir() to explicitly not work with merges
`hg fix` errors out early if there is an unfinished merge, so we
should have only one parent here. Making that explicit makes my next
patches simpler.
Differential Revision: https://phab.mercurial-scm.org/D11209
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 11 Mar 2019 10:56:56 -0700 |
parents | 148d177a4f2d |
children | 6000f5b25c9b |