mercurial/thirdparty/__init__.py
author Pulkit Goyal <pulkit@yandex-team.ru>
Sun, 26 Aug 2018 19:14:26 +0300
changeset 39285 a3fd84f4fb38
parent 34397 765eb17a7eb8
permissions -rw-r--r--
filemerge: fix the wrong placements of messages in prompt Mistakenly, the local-changed-other-deleted-message was put in other-change-local-deleted and vice versa. This followups on D4336. Thanks to Yuya who spotted this. Differential Revision: https://phab.mercurial-scm.org/D4375