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

merge with crew

Thomas Arendsen Hein - - Load All Authors

File last commit:

r1933:7544700f default


                r1957:29501032

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

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	1:016807e6fdaf
		0:eb43f19ff115
		016807e6fdaf tip
		eb43f19ff115
		eb43f19ff115+
		eb43f19ff115
		016807e6fdaf tip
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	merging file1
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	016807e6fdaf tip
		016807e6fdaf tip
		016807e6fdaf tip
		016807e6fdaf 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