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

keyword: mimic cmdutil.bail_if_changed even more...

keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

Matt Mackall - - Load All Authors

File last commit:

r5764:8a5d8fb5 default


                r6672:6004eedb

default

Download file

             test-586.out
        
                    13 lines
            
             | 365 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-586.out

History | Annotation | Raw |Copy content |Copy permalink

				adding a
				adding b
				pulling from ../a
				searching for changes
				warning: repository is unrelated
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				C 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