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

Windows py2exe version didn't handle names given to templatepath() correctly

mpm@selenic.com - - Load All Authors

File last commit:

r1043:9344f5dd default


                r2001:a439b7b5

default

Download file

             test-merge6.out
        
                    18 lines
            
             | 536 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge6.out

History | Annotation | Raw |Copy content |Copy permalink

				pulling from ../B1
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg update' to get a working copy)
				bar should remain deleted.
				f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
				pulling from ../A2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)
				(run 'hg update' to get a working copy)
				bar should remain deleted.
				f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

	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