upstream/mercurial-mirror Files · tests/test-rebuildstate.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.

Matt Mackall - - Load All Authors

File last commit:

r5764:8a5d8fb5 default


                r6206:0b6f1249

default

Download file

             test-rebuildstate.out
        
                    17 lines
            
             | 207 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rebuildstate.out

History | Annotation | Raw |Copy content |Copy permalink

				adding bar
				adding foo
				% state dump
				a 0 -1 baz
				n 644 0 foo
				r 0 0 bar
				% status
				A baz
				R bar
				C foo
				% state dump
				n 666 -1 bar
				n 666 -1 foo
				% status
				! bar
				? baz
				C foo

	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