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

Moving hgweb.py into it's own module in preparation for breaking it up.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default


                r2311:b832b6eb

default

Download file

             test-conflict.out
        
                    13 lines
            
             | 367 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.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
mpm@selenic.com merge3: fix argument order...	r346	merge: warning: conflicts during merge
		merging a
		merging a failed!
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		There are unresolved merges, you can redo the full merge using:
		hg update -C 2
		hg merge 1
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	e7fe8eb3e180+0d24b7662d3e+ tip
mpm@selenic.com merge3: fix argument order...	r346	something else
		=======
		something
mpm@selenic.com Update test output for status change...	r748	M a

	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