diff tests/test-lfconvert.t @ 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 40b51c28b242
children bf11ff22a9af
line wrap: on
line diff