upstream/mercurial-mirror Files · tests/test-merge-force.out

convert/git: check status when reading the whole output

Steve Borho - - Load All Authors

File last commit:

r8545:3682a19b default


                r10986:610f0473

stable

Download file

             test-merge-force.out
        
                    11 lines
            
             | 332 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-force.out

History | Annotation | Raw |Copy content |Copy permalink

				created new head
				% local deleted a file, remote removed
				abort: outstanding uncommitted changes (use 'hg status' to list changes)
				resolving manifests
				removing a
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				% should show a as removed
				R a
				% manifest. should not have a:
				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