diff mercurial/helptext/scripting.txt @ 47510:94c58f3aab56

dirstate: add a `in_merge` property This factor the "p2 is not null" check and is fairly simpler to read. Differential Revision: https://phab.mercurial-scm.org/D10952
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 03 Jul 2021 20:12:46 +0200
parents d56a2d6f34f0
children
line wrap: on
line diff