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

Update win32 merge tools configuration...

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

Matt Mackall - - Load All Authors

File last commit:

r6375:cdc458b1 default


                r7665:950484f0

default

Download file

             test-issue619.out
        
                    10 lines
            
             | 314 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue619.out

History | Annotation | Raw |Copy content |Copy permalink

				adding a
				marked working directory as branch b
				adding b
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				fast-forward
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				bogus fast-forward should fail
				abort: can't merge with ancestor
				done

	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