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

repo.status: also compare flags for files in the lookup list....

repo.status: also compare flags for files in the lookup list. We might be able to do something smarter about this in dirstate.status for files in normallookup state, but that would require some extra care to keep backwards compatibility.

Brendan Cully - - Load All Authors

File last commit:

r4437:a210b40d default


                r6158:23ffe826

default

Download file

             test-mq-merge.out
        
                    12 lines
            
             | 217 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
				a
				b
				merging with queue at: .hg/patches.1
				applying rm_a
				Now at: rm_a
				b
				Patch queue now empty

	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