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

cmdutil: always expose "files_add", "files_del" and "manifest" templater properties

Matt Mackall - - Load All Authors

File last commit:

r5042:f191bc39 default


                r5545:5a124ce4

default

Download file

             test-merge9.out
        
                    21 lines
            
             | 587 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge9.out

History | Annotation | Raw |Copy content |Copy permalink

				adding bar
				adding foo
				adding quux1
				adding quux2
				merging bar
				merging bar failed!
				merging foo and baz
				merging baz failed!
				1 files updated, 0 files merged, 0 files removed, 2 files unresolved
				There are unresolved merges, you can redo the full merge using:
				hg update -C 2
				hg merge 1
				3 files updated, 0 files merged, 1 files removed, 0 files unresolved
				merging bar
				merging bar failed!
				merging baz and foo
				merging baz failed!
				1 files updated, 0 files merged, 0 files removed, 2 files unresolved
				There are unresolved merges, you can redo the full merge using:
				hg update -C 1
				hg merge 2

	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