upstream/mercurial-mirror Files · tests/test-diff-newlines.out

commit: when committing the results of a merge, it's all or nothing...

commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

Matt Mackall - - Load All Authors

File last commit:

r5863:3d1f9dce default


                r6385:0d4e068e

default

Download file

             test-diff-newlines.out
        
                    8 lines
            
             | 196 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-diff-newlines.out

History | Annotation | Raw |Copy content |Copy permalink

				adding a
				diff -r 107ba6f817b5 -r 310ce7989cdc a
				--- a/a Thu Jan 01 00:00:01 1970 +0000
				+++ b/a Thu Jan 01 00:00:02 1970 +0000
				@@ -1,2 +1,3 @@
				confuse str.splitlines
				embedded newline
				+clean diff

	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