diff tests/test-double-merge.t @ 33779:9fa874fb34e1

obsolete: rename bumped volatile set into phasedivergent volatile set The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D255
author Boris Feld <boris.feld@octobus.net>
date Fri, 04 Aug 2017 19:39:34 +0200
parents 564a354f7f35
children 91a0bc50b288
line wrap: on
line diff