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

abort when merging two heads and repository has local changes

mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default


                r1581:db10b711

default

Download file

             test-merge-revert2.out
        
                    26 lines
            
             | 425 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-revert2.out

History | Annotation | Raw |Copy content |Copy permalink

				1:f4d7a8c73d23
				0:232e179b3f29
				f4d7a8c73d23 tip
				232e179b3f29
				232e179b3f29+
				232e179b3f29
				f4d7a8c73d23 tip
				merge: warning: conflicts during merge
				merging file1
				merging file1 failed!
				diff -r f4d7a8c73d23 file1
				--- a/file1
				+++ b/file1
				@@ -1,3 +1,7 @@
				added file1
				another line of text
				+<<<<<<<
				+changed file1 different
				+=======
				changed file1
				+>>>>>>>
				M file1
				f4d7a8c73d23+ tip
				f4d7a8c73d23 tip
				f4d7a8c73d23 tip
				f4d7a8c73d23 tip

	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