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

Clean up some merge logic...

Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r993:6f274afc

default

Download file

             test-conflict.out
        
                    8 lines
            
             | 135 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.out

History | Annotation | Raw |Copy content |Copy permalink

				merge: warning: conflicts during merge
				merging a
				merging a failed!
				32e80765d7fe+75234512624c+ tip
				something else
				=======
				something
				M a

	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