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

Make contrib/buildrpm work on Fedora 9....

Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r6381:0b89315d default


                r7277:3e000e2b

default

Download file

             test-merge5.out
        
                    7 lines
            
             | 266 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				removing b
				created new head
				% should abort
				abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
				% should succeed
				abort: crosses branches (use 'hg merge' or 'hg update -C')

	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