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

RhodeCode Free Hosting

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

upstream » mercurial-mirror

RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r7277:3e000e2b

default

Download file

             test-merge4.out
        
                    4 lines
            
             | 194 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge4.out

History | Annotation | Raw |Copy content |Copy permalink

				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				created new head
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

	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