upstream/mercurial-mirror Files · hgext/largefiles/CONTRIBUTORS

test-merge-tools.t: add 'hg resolve --list' output to tests...

test-merge-tools.t: add 'hg resolve --list' output to tests In upcoming patches we're going to be making some improvements to the ':prompt' merge tool, and one of them is recovering appropriately from exceptions. It is important in such cases to make sure that the merge state is written out properly. I went through the output and verified that it all makes sense.

various - - Load All Authors

File last commit:

r15168:cfccd3be default


                r26897:da1c706c

default

Download file

             CONTRIBUTORS
        
                    4 lines
            
             | 172 B
            
                | text/plain
            
             |
                TextLexer

/ hgext / largefiles / CONTRIBUTORS

History | Annotation | Raw |Copy content |Copy permalink

				Greg Ward, author of the original bfiles extension
				Na'Tosha Bard of Unity Technologies
				Fog Creek Software
				Special thanks to the University of Toronto and the UCOSP program

	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