annotate tests/gpg/trustdb.gpg @ 39285:a3fd84f4fb38

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 6fce36336e42
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8809
6fce36336e42 gpg: add test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 (binary:application/octet-stream)