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

diff: add --inverse option...

diff: add --inverse option Most of the time, one can reverse a diff by swapping the revisions passed with -r but it happens that if you use the global -R, and diff against the tip of the current repo, you can't swap the revisions. One use-case for that is reviewing changes from a bundle before unbundling. One could also pipe the output of `hg diff` to a command line filter that reverses the diff, but that would remove the benefit from color diffs. Therefore, having an option in `hg diff` to reverse a diff is a good thing. The option flag selection was tricky. GNU patch uses -R/--reverse but -R is already used as a global option and --reverse would make --rev ambiguous.

Stuart W Marks - - Load All Authors

File last commit:

r9468:b2310903 default


                r9725:3f522d2f

default

Download file

             test-conflict.out
        
                    15 lines
            
             | 399 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall merge: allow smarter tool configuration...	r6004	merging a
Alexis S. L. Carvalho change tests to use simplemerge by default	r4365	warning: conflicts during merge.
mpm@selenic.com merge3: fix argument order...	r346	merging a failed!
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 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
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	e7fe8eb3e180+0d24b7662d3e+ tip
Matt Mackall merge: allow smarter tool configuration...	r6004	<<<<<<< local
mpm@selenic.com merge3: fix argument order...	r346	something else
		=======
		something
Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge...	r4387	>>>>>>> other
mpm@selenic.com Update test output for status change...	r748	M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig

	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