Mercurial > hg
diff mercurial/merge.py @ 36358:075ef2d2e38d
py3: two more narrow tests passing
Differential Revision: https://phab.mercurial-scm.org/D2390
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 22 Feb 2018 01:00:57 -0500 |
parents | 759579bac31d |
children | 035b77bf01d2 |