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

run-tests.py: pass -L/--label to simplemerge...

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Matt Mackall - - Load All Authors

File last commit:

r4304:4787e2b0 default


                r4387:93a4e72b

default

Download file

             test-merge8.out
        
                    10 lines
            
             | 334 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge8.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				pulling from ../a
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 1 files
				(run 'hg update' to get a working copy)
				merging a and b
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved

	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