Mercurial > hg-stable
view tests/test-batching.py.out @ 44378:ab632e27f296
tests: add `hg log -G` output when there are merge conflicts
The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.
Differential Revision: https://phab.mercurial-scm.org/D8042
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 29 Jan 2020 14:42:54 -0800 |
parents | 33a6eee08db2 |
children |
line wrap: on
line source
== Local Ready. Un and Deux Eins und Zwei One and Two Eins und Zwei Uno und Due == Remote Ready. REQ: foo?one=Vo&two=Efvy -> Vo!boe!Efvy Un and Deux REQ: bar?b=Fjot&a=[xfj -> Fjot!voe![xfj Eins und Zwei REQ: batch?cmds=foo:one=Pof,two=Uxp;bar:b=Fjot,a=[xfj;bar:b=Vop,a=Evf -> Pof!boe!Uxp;Fjot!voe![xfj;Vop!voe!Evf One and Two Eins und Zwei Uno und Due