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

Merge backout of

John Mulligan - - Load All Authors

File last commit:

r8694:ca8d05e1 default


                r9324:19d07553

default

Download file

             test-merge-closedheads.out
        
                    17 lines
            
             | 740 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-closedheads.out

History | Annotation | Raw |Copy content |Copy permalink

				adding foo
				adding bar
				adding baz
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				created new head
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				created new head
				% fail with three heads
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				abort: branch 'default' has 3 heads - please merge with an explicit rev
				% close one of the heads
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				% succeed with two open heads
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

	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