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

convert/p4: win32 fixes...

convert/p4: win32 fixes * cmd.exe does not know single quotes * win32 does not like trailing whitespace very much. Trade test coverage for maintenance time and drop the trailing whitespaces tests.

Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default


                r8063:ee8d9b93

default

Download file

             test-resolve.out
        
                    8 lines
            
             | 315 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-resolve.out

History | Annotation | Raw |Copy content |Copy permalink

				adding file
				% create a second head
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				created new head
				% failing merge
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
				% resolve -l, should be 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