comparison tests/test-merge-local.t @ 33781:3821dfee2cfc

label: rename changeset.troubled into changeset.unstable The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D257
author Boris Feld <boris.feld@octobus.net>
date Thu, 03 Aug 2017 14:32:50 +0200
parents 69ffbbe73dd0
children 9e4f82bc2b0b
comparison
equal deleted inserted replaced
33780:2415ad743642 33781:3821dfee2cfc