Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.editorconfig
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 13 Mar 2021 03:17:00 +0100
changeset 46815 433cef8f3104
parent 45392 c25efc468a49
permissions -rw-r--r--
copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28793
d30fdd6d1bf7 mercurial: add editorconfig
Jun Wu <quark@fb.com>
parents:
diff changeset 
     1
 
# See http://EditorConfig.org for the specification
d30fdd6d1bf7 mercurial: add editorconfig
Jun Wu <quark@fb.com>
parents:
diff changeset 
     2
 












d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     3


root = true













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     4














d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     5


[*.py]













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     6


indent_size = 4













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     7


indent_style = space













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     8


trim_trailing_whitespace = true








45392






c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig



Matt Harbison <matt_harbison@yahoo.com>


parents: 
38281

diff
changeset




     9


end_of_line = lf








28793






d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    10














d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    11


[*.{c,h}]













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    12


indent_size = 8













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    13


indent_style = tab













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    14


trim_trailing_whitespace = true








45392






c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig



Matt Harbison <matt_harbison@yahoo.com>


parents: 
38281

diff
changeset




    15


end_of_line = lf








38281






1d6066336d7b
mercurial: add .t files to .editorconfig



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
28793

diff
changeset




    16














1d6066336d7b
mercurial: add .t files to .editorconfig



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
28793

diff
changeset




    17


[*.t]













1d6066336d7b
mercurial: add .t files to .editorconfig



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
28793

diff
changeset




    18


indent_size = 2













1d6066336d7b
mercurial: add .t files to .editorconfig



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
28793

diff
changeset




    19


indent_style = space













1d6066336d7b
mercurial: add .t files to .editorconfig



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
28793

diff
changeset




    20


trim_trailing_whitespace = false








45392






c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig



Matt Harbison <matt_harbison@yahoo.com>


parents: 
38281

diff
changeset




    21


end_of_line = lf















Mercurial