diff mercurial/rcutil.py @ 33728:8b2d7684407b

context: rename divergent into contentdivergent Rename divergent context method into contentdivergent and add a deprecation warning on divergent. Only update all callers to keep the patch straightforward. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D240
author Boris Feld <boris.feld@octobus.net>
date Wed, 02 Aug 2017 19:02:48 +0200
parents d74b0cff94a9
children 75979c8d4572
line wrap: on
line diff