upstream/mercurial-mirror Files · contrib/python-zstandard/c-ext

diff: add experimental support for "merge diffs"...

diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

Augie Fackler -


            r47177:1a7d12c8

default

Name	Size	Modified	Last Commit	Author
/ contrib / python-zstandard / c-ext
bufferutil.c	Loading ...
compressionchunker.c	Loading ...
compressiondict.c	Loading ...
compressionparams.c	Loading ...
compressionreader.c	Loading ...
compressionwriter.c	Loading ...
compressobj.c	Loading ...
compressor.c	Loading ...
compressoriterator.c	Loading ...
constants.c	Loading ...
decompressionreader.c	Loading ...
decompressionwriter.c	Loading ...
decompressobj.c	Loading ...
decompressor.c	Loading ...
decompressoriterator.c	Loading ...
frameparams.c	Loading ...
python-zstandard.h	Loading ...

	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