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

fetch: switch the default parent used for a merge...

fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

Patrick Mezard - - Load All Authors

File last commit:

r5406:f11554a0 default


                r6206:0b6f1249

default

Download file

             test-manifest.out
        
                    23 lines
            
             | 294 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-manifest.out

History | Annotation | Raw |Copy content |Copy permalink

				a
				b/a
				l
				644 a
				755 * b/a
				644 @ l
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
				047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
				a
				l
				a
				b/a
				l
				a
				b/a
				l
				% should fail
				abort: unknown revision '2'!
				abort: please specify just one revision
				a
				b/a
				l

	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