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

keyword: remove "identify" and "remove" from nokwcommands...

keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list.

Matt Mackall - - Load All Authors

File last commit:

r6004:5af5f0f9 default


                r6157:09b00faa

default

Download file

             test-conflict.out
        
                    16 lines
            
             | 398 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				merging a
				warning: conflicts during merge.
				merging a failed!
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				There are unresolved merges, you can redo the full merge using:
				hg update -C 2
				hg merge 1
				e7fe8eb3e180+0d24b7662d3e+ tip
				<<<<<<< local
				something else
				=======
				something
				>>>>>>> other
				M a
				? a.orig

	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