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

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates

Matt Mackall - - Load All Authors

File last commit:

r3727:0fb66912 default


                r4315:bc6f5a1d

default

Download file

             test-rename-merge1.out
        
                    25 lines
            
             | 790 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rename-merge1.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add core copy detection algorithm...	r3153	checkout
		2 files updated, 0 files merged, 2 files removed, 0 files unresolved
		merge
		resolving manifests
Matt Mackall merge: various tidying...	r3314	overwrite None partial False
		ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
Matt Mackall merge: report destinations of moves in merge action messages	r3727	a: remote moved to b -> m
Matt Mackall Add core copy detection algorithm...	r3153	b2: remote created -> g
Matt Mackall merge: shortcircuit filemerge for identical files...	r3311	merging a and b
Matt Mackall merge: various tidying...	r3314	my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
Matt Mackall merge: fixes for merge+rename...	r3251	copying a to b
		removing a
Matt Mackall Add core copy detection algorithm...	r3153	getting b2
Matt Mackall merge: fixes for merge+rename...	r3251	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Matt Mackall Add core copy detection algorithm...	r3153	(branch merge, don't forget to commit)
Matt Mackall merge: fixes for merge+rename...	r3251	M b
		a
		M b2
		R a
		C c2
Matt Mackall Add core copy detection algorithm...	r3153	blahblah
Matt Mackall merge: remember rename copies and parents properly on commit...	r3292	rev offset length base linkrev nodeid p1 p2
		0 0 67 0 1 dc51707dfc98 000000000000 000000000000
		1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98
Matt Mackall refactor debugrenamed	r3652	b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

	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