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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r6138:09847b90 default


                r6206:0b6f1249

default

Download file

             test-issue352.out
        
                    14 lines
            
             | 316 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue352.out

History | Annotation | Raw |Copy content |Copy permalink

				adding he llo
				abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
				adding he llo
				abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
				adding hell
				o
				abort: '\n' and '\r' disallowed in filenames: 'hell\no'
				adding hell
				o
				abort: '\n' and '\r' disallowed in filenames: 'hell\no'
				f he llo he llo
				f hell
				o hell
				o

	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