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

Removed special FIXME handling in run-tests, added bug info to .out files.

mpm@selenic.com - - Load All Authors

File last commit:

r814:0902ffec default


                r833:ad8ff353

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