diff tests/test-stabilize-conflict.t @ 3931:b627e165ad20 stable

compat: add a fixed version of mergecopies for hg<=4.3 In hg<=4.3, copies._fullcopytracing() does not exist and we have to wrap copies.mergecopies() to fix the AssertionError coming from core.
author Pulkit Goyal <pulkit@yandex-team.ru>
date Thu, 02 Aug 2018 16:54:40 +0300
parents 629558d09898
children d00f0c369bc7 fb8e44c70798
line wrap: on
line diff