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

Merge with MPM.

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r946:6d21a348

default

Download file

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

/ tests / test-merge6.out

History | Annotation | Raw |Copy content |Copy permalink

				pulling from ../B1
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				bar should remain deleted.
				6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
				pulling from ../A2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files
				(run 'hg update' to get a working copy)
				bar should remain deleted.
				6b70e9e451a5a33faad7bbebe627e46b937b7364 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