upstream/mercurial-mirror Files · tests/test-merge-symlinks.out

mq: handle added patch renaming correctly

Patrick Mezard - - Load All Authors

File last commit:

r5408:36794dbe default


                r6648:2519976a

default

Download file

             test-merge-symlinks.out
        
                    17 lines
            
             | 497 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-symlinks.out

History | Annotation | Raw |Copy content |Copy permalink

				3 files updated, 0 files merged, 0 files removed, 0 files unresolved
				% merge heads
				HG_FILE l
				HG_MY_ISLINK 1
				HG_OTHER_ISLINK 0
				HG_BASE_ISLINK 0
				merging l
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				% merge working directory
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				HG_FILE l2
				HG_MY_ISLINK 1
				HG_OTHER_ISLINK 0
				HG_BASE_ISLINK 0
				merging l2
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved

	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