Mercurial Mercurial > hg-stable / 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 Ryan McElroy <rmcelroy@fb.com>
Fri, 06 Oct 2017 06:48:43 -0700
changeset 34679 143337bcec9b
parent 28793 d30fdd6d1bf7
child 38293 1d6066336d7b
permissions -rw-r--r--
merge: add tests to show current behavior on failed filemerges Currently, failed file merges will nevertheless force the user to continue attempting to merge all additional unresolved files. Future patches will allow the user to halt the merge process instead. This patch first introduces a test demonstrating the current bejhavior so the upcoming changes are more obvious. Differential Revision: https://phab.mercurial-scm.org/D930
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













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     9














d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    10


[*.{c,h}]













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    11


indent_size = 8













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    12


indent_style = tab













d30fdd6d1bf7
mercurial: add editorconfig



Jun Wu <quark@fb.com>


parents: 

diff
changeset




    13


trim_trailing_whitespace = true















hg-stable