upstream/mercurial-mirror Files · tests/test-conflict.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

Merge with TAH

mpm@selenic.com - - Load All Authors

File last commit:

r814:0902ffec default


                r910:891b6a26

default

Download file

             test-conflict.out
        
                    17 lines
            
             | 290 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.out

History | Annotation | Raw |Copy content |Copy permalink

				+ hg init
				+ hg add a
				+ hg commit -m ancestor -d 0 0
				+ hg commit -m branch1 -d 0 0
				+ hg co 0
				+ hg commit -m branch2 -d 0 0
				+ hg up -m 1
				merge: warning: conflicts during merge
				merging a
				merging a failed!
				+ hg id
				32e80765d7fe+75234512624c+ tip
				something else
				=======
				something
				+ hg status
				M a

	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