Mercurial > hg

diff tests/test-narrow-merge.t @ 39285:a3fd84f4fb38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sun, 26 Aug 2018 19:14:26 +0300
parents dc01484606da
children 8e855e9984a6
line wrap: on
line diff