upstream/mercurial-mirror Files · contrib/python-zstandard/tests

simplemerge: use same newline detection for :mergediff as for :merge[3]...

simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976

Martin von Zweigbergk -


            r49408:b5e1283c

default

Name	Size	Modified	Last Commit	Author
/ contrib / python-zstandard / tests
__init__.py	Loading ...
common.py	Loading ...
test_buffer_util.py	Loading ...
test_compressor.py	Loading ...
test_compressor_fuzzing.py	Loading ...
test_data_structures.py	Loading ...
test_data_structures_fuzzing.py	Loading ...
test_decompressor.py	Loading ...
test_decompressor_fuzzing.py	Loading ...
test_estimate_sizes.py	Loading ...
test_module_attributes.py	Loading ...
test_train_dictionary.py	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