upstream/mercurial-mirror Files · tests/test-rename-merge1.out

Add -D/--nodates options to hg diff/export that removes dates from diff headers...

Add -D/--nodates options to hg diff/export that removes dates from diff headers and replace uses of sed in the tests with --nodates.

Matt Mackall - - Load All Authors

File last commit:

r3153:c82ea81d default


                r3199:096f1c73

default

Download file

             test-rename-merge1.out
        
                    14 lines
            
             | 404 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rename-merge1.out

History | Annotation | Raw |Copy content |Copy permalink

				checkout
				2 files updated, 0 files merged, 2 files removed, 0 files unresolved
				merge
				resolving manifests
				overwrite None branchmerge True partial False
				ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
				b: remote created -> g
				b2: remote created -> g
				getting b
				getting b2
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				blahblah
				foo

	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