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

merge with crew

Dirkjan Ochtman - - Load All Authors

File last commit:

r8433:9a398dd5 default


                r8602:b26aaf13

default

Download file

             test-mq-merge.out
        
                    23 lines
            
             | 491 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mq-merge.out

History | Annotation | Raw |Copy content |Copy permalink

				adding a
				adding b
				copy .hg/patches to .hg/patches.1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				M b
				created new head
				a
				b
				merging with queue at: .hg/patches.1
				applying rm_a
				now at: rm_a
				b
				patch queue now empty

				% init t2
				adding a
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				% create the reference queue
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				% merge
				merging with queue at refqueue
				applying patcha
				now at: patcha

	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