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

forgot to rerun tests after changed backup extension to .orig....

forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this.

Vadim Gelfer - - Load All Authors

File last commit:

r2030:8d9ec30d default


                r2030:8d9ec30d

default

Download file

             test-merge-revert.out
        
                    20 lines
            
             | 326 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-revert.out

History | Annotation | Raw |Copy content |Copy permalink

				1:016807e6fdaf
				0:eb43f19ff115
				016807e6fdaf tip
				eb43f19ff115
				eb43f19ff115+
				saving current version of file1 as file1.orig
				reverting file1
				? file1.orig
				eb43f19ff115
				? file1.orig
				016807e6fdaf tip
				merging file1
				? file1.orig
				016807e6fdaf tip
				? file1.orig
				016807e6fdaf tip
				? file1.orig
				016807e6fdaf tip
				? file1.orig
				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