view tests/test-wireproto.py.out @ 45916:fa87536d3d70

errors: raise StateError when there are unresolves merge conflicts Differential Revision: https://phab.mercurial-scm.org/D9392
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 16:48:13 -0800
parents 40381a88bab4
children
line wrap: on
line source

Hello, Foobar
[b'Hello, Fo, =;:<o', b'Hello, Bar']