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

merge 0.8.1 with revlogng

Vadim Gelfer - - Load All Authors

File last commit:

r2029:d436b21b default


                r2083:345107e1

default

Download file

             test-merge-revert2.out
        
                    28 lines
            
             | 469 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-revert2.out

History | Annotation | Raw |Copy content |Copy permalink

				1:f248da0d4c3e
				0:9eca13a34789
				f248da0d4c3e tip
				9eca13a34789
				9eca13a34789+
				reverting file1
				9eca13a34789
				f248da0d4c3e tip
				merge: warning: conflicts during merge
				merging file1
				merging file1 failed!
				diff -r f248da0d4c3e file1
				--- a/file1
				+++ b/file1
				@@ -1,3 +1,7 @@ added file1
				added file1
				another line of text
				+<<<<<<<
				+changed file1 different
				+=======
				changed file1
				+>>>>>>>
				M file1
				f248da0d4c3e+ tip
				reverting file1
				f248da0d4c3e tip
				f248da0d4c3e tip
				f248da0d4c3e 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