upstream/mercurial-mirror Files · tests/test-hgrc

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:

r4659:7a7d4937 default


                r6206:0b6f1249

default

Download file

             test-hgrc
        
                    7 lines
            
             | 105 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-hgrc

History | Source | Raw |Copy content |Copy permalink

Benoit Boissinot make readconfig take a filename instead of a file pointer as argument...	r1473	#!/bin/sh

		mkdir t
		cd t
		hg init
		echo "invalid" > .hg/hgrc
Thomas Arendsen Hein Kill trailing spaces	r4659	hg status 2>&1 \|sed -e "s:/.\(/t/.\):...\1:"

	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