upstream/mercurial-mirror Files · tests/test-wireproto.py.out

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Augie Fackler - - Load All Authors

File last commit:

r25708:d3d32643 default


                r27025:ec372573

default

Download file

             test-wireproto.py.out
        
                    2 lines
            
             | 49 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-wireproto.py.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein test-wireprotocol.py: rename to test-wireproto.py for consistency...	r14765	Hello, Foobar
Augie Fackler wireproto: correctly escape batched args and responses (issue4739)...	r25708	['Hello, Fo, =;:<o', 'Hello, Bar']

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages