Mercurial > hg
view contrib/plan9/hgrc.d/9diff.rc @ 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 | ba89c3872801 |
children |
line wrap: on
line source
# The 9diff extdiff command generates diff(1) compatible output # suitable for use with the plumber(4). [extensions] extdiff = [extdiff] 9diff = /bin/mercurial/9diff -cm $parent $child $root