upstream/mercurial-mirror Files · tests/test-merge6.out

Fix a couple fencepost errors in hg log

mpm@selenic.com - - Load All Authors

File last commit:

r993:6f274afc default


                r1042:23f9d71a

default

Download file

             test-merge6.out
        
                    18 lines
            
             | 514 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge6.out

History | Source | Raw |Copy content |Copy permalink

maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	pulling from ../B1
		searching for changes
		adding changesets
		adding manifests
mpm@selenic.com Fix up test results...	r775	adding file changes
		added 1 changesets with 1 changes to 1 files
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	(run 'hg update' to get a working copy)
		bar should remain deleted.
mpm@selenic.com Clean up some merge logic...	r993	f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	pulling from ../A2
		searching for changes
		adding changesets
		adding manifests
mpm@selenic.com Fix up test results...	r775	adding file changes
		added 1 changesets with 0 changes to 0 files
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	(run 'hg update' to get a working copy)
		bar should remain deleted.
mpm@selenic.com Fix long-standing excessive file merges...	r990	f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

	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