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

Benoit Boissinot - - Load All Authors

File last commit:

r3592:fffc8a73 default


                r6206:0b6f1249

default

Download file

             test-merge5.out
        
                    3 lines
            
             | 159 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan Update tests to match new addremove chattiness.	r767	removing b
Benoit Boissinot Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140	r3592	abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes

	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