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

test-serve: wait before killing to always hide the "killed!" message....

test-serve: wait before killing to always hide the "killed!" message. Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.

Matt Mackall - - Load All Authors

File last commit:

r4416:bb1800a7 default


                r6000:8e7d6498

default

Download file

             test-merge8.out
        
                    9 lines
            
             | 318 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge8.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)...	r3389	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)
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	1 files updated, 0 files merged, 1 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