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

diff: fix obscure off-by-one error in diff -p

Matt Mackall - - Load All Authors

File last commit:

r6518:92ccccb5 default


                r7436:07faba78

default

Download file

             test-merge9.out
        
                    37 lines
            
             | 725 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge9.out

History | Annotation | Raw |Copy content |Copy permalink

				adding bar
				adding foo
				adding quux1
				adding quux2
				created new head
				merging bar
				merging bar failed!
				merging foo and baz to baz
				1 files updated, 1 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				U bar
				R baz
				3 files updated, 0 files merged, 1 files removed, 0 files unresolved
				merging bar
				merging bar failed!
				merging baz and foo to baz
				1 files updated, 1 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				% show unresolved
				U bar
				R baz
				% unmark baz
				% show
				U bar
				U baz
				% re-resolve baz
				merging baz and foo to baz
				% after
				U bar
				R baz
				% resolve all
				merging bar
				warning: conflicts during merge.
				merging bar failed!
				% after
				U bar
				R baz

	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