comparison mercurial/commit.py @ 48113:e2da3ec94169

dirstate-item: point out that `merged` is set only with p1_tracked This is currently True, and we will use this fact to simplify the API in the next commit. However, we add this assertion first to validate that this is True in the whole test-suite.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 30 Sep 2021 18:07:31 +0200
parents 5b9de38a0356
children f1eb77dceb36
comparison
equal deleted inserted replaced
48112:fabf687df0ff 48113:e2da3ec94169