annotate tests/test-wireproto.py.out @ 26606:2a405d307f8c

filemerge: also return whether the merge is complete In future patches, we'll pause merges after the premerge step. After the premerge step we'll return complete = False.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 12:56:21 -0700
parents d3d32643c060
children 40381a88bab4
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
25708
d3d32643c060 wireproto: correctly escape batched args and responses (issue4739)
Augie Fackler <augie@google.com>
parents: 14765
diff changeset
2 ['Hello, Fo, =;:<o', 'Hello, Bar']