upstream/mercurial-mirror Files · tests/test-simple-update.out

run merge program in repo root....

run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r1885:c4d57726

default

Download file

             test-simple-update.out
        
                    21 lines
            
             | 539 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-simple-update.out

History | Annotation | Raw |Copy content |Copy permalink

				adding foo
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions
				pulling from ../branch
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 2 changesets, 2 total revisions
				foo
				bar
				6f4310b00b9a147241b071a60c28a650827fb03d 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