annotate tests/test-wireproto.py.out @ 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 40381a88bab4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14622
bd88561afb4b wireproto: add batching support to wirerepository
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
1 Hello, Foobar
37923
40381a88bab4 tests: port test-wireproto.py to Python 3
Augie Fackler <augie@google.com>
parents: 25708
diff changeset
2 [b'Hello, Fo, =;:<o', b'Hello, Bar']