upstream/mercurial-mirror Files · tests/test-merge9.out

templatekw: change {file_copies} behaviour, add {file_copies_switch}...

templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.

Stuart W Marks - - Load All Authors

File last commit:

r9468:b2310903 default


                r10060:f780b109

default

Download file

             test-merge9.out
        
                    43 lines
            
             | 909 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge9.out

History | Source | Raw |Copy content |Copy permalink

Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename...	r4682	adding bar
		adding foo
		adding quux1
		adding quux2
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename...	r4682	merging bar
		merging bar failed!
Matt Mackall merge: introduce mergestate	r6512	merging foo and baz to baz
Matt Mackall merge: allow smarter tool configuration...	r6004	1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message...	r9468	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
Matt Mackall resolve: new command...	r6518	U bar
		R baz
Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename...	r4682	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
		merging bar
		merging bar failed!
Matt Mackall merge: introduce mergestate	r6512	merging baz and foo to baz
Matt Mackall merge: allow smarter tool configuration...	r6004	1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message...	r9468	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
Matt Mackall resolve: new command...	r6518	% show unresolved
		U bar
		R baz
		% unmark baz
		% show
		U bar
		U baz
Matt Mackall resolve: keep .orig files	r7847	M bar
		M baz
		M quux2
		? bar.orig
Matt Mackall resolve: new command...	r6518	% re-resolve baz
		merging baz and foo to baz
		% after
		U bar
		R baz
Matt Mackall resolve: require -a switch to resolve all files...	r7527	% resolve all warning
		abort: no files or directories specified; use --all to remerge all files
Matt Mackall resolve: new command...	r6518	% resolve all
		merging bar
		warning: conflicts during merge.
		merging bar failed!
		% after
		U bar
		R baz

	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