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

Update on pull -u when heads were closed (fixes issue666)....

Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default


                r5080:73fdc8bd

default

Download file

             test-merge4.out
        
                    3 lines
            
             | 177 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge4.out

History | Annotation | Raw |Copy content |Copy permalink

				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

	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