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

test fixes for Solaris 2.6...

test fixes for Solaris 2.6 Solaris 2.6's stock sed doesn't support alternatives in regular expression. We workaround by breaking up the regexp.

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r949:d9971481

default

Download file

             test-merge1.out
        
                    7 lines
            
             | 88 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge1.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
mpm@selenic.com Fix up test-merge1...	r430	This is file b1
		merging for b
		merging b
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b

	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