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

churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r9388:f7968bba

default

Download file

             test-merge4.out
        
                    4 lines
            
             | 194 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge4.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

	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