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

minor optimization: save some string trash

mpm@selenic.com - - Load All Authors

File last commit:

r1236:67a28636 default


                r1540:8ca9f5b1

default

Download file

             test-merge1.out
        
                    13 lines
            
             | 220 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge1.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% no merges expected
		%% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%%
		Contents of b should be "this is file b1"
mpm@selenic.com Fix up test-merge1...	r430	This is file b1
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge expected!
mpm@selenic.com Fix up test-merge1...	r430	merging for b
		merging b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge of b expected
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