Mercurial > hg
comparison mercurial/unionrepo.py @ 47914:8e46934c58d2
dirstate: drop the deprecated `merge` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11349
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:11:57 +0200 |
parents | 2b69555e4875 |
children | 52034c42c09d |
comparison
equal
deleted
inserted
replaced
47913:3911c61f09c6 | 47914:8e46934c58d2 |
---|