Mercurial > hg
annotate tests/test-wireproto.py.out @ 38679:b3d0c97a0820
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 08:59:42 +0530 |
parents | 40381a88bab4 |
children |
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'] |