upstream/mercurial-mirror Files · tests/test-merge-revert.out

Merge with upstream

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r1743:813f9f5f

default

Download file

             test-merge-revert.out
        
                    12 lines
            
             | 186 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-revert.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com run-tests: remove '+ hg' trick...	r925	1:3aa14bbc23d9
		0:8633637036c1
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	3aa14bbc23d9 tip
		8633637036c1
		8633637036c1+
		8633637036c1
		3aa14bbc23d9 tip
		merging file1
		3aa14bbc23d9 tip
mpm@selenic.com run-tests: remove '+ hg' trick...	r925	3aa14bbc23d9 tip
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	3aa14bbc23d9 tip
		3aa14bbc23d9 tip

	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