Mercurial > hg
view .editorconfig @ 45282:b442920ab1de
merge: introduce mergeresult.addfile() and use it
We want to use mergeresult object at more and more places instead of this
actions dict to simplify code and further add new APIs to mergeresult object.
This patch introduces `addfile()` which adds a new file to the internal actions
dict for now.
Differential Revision: https://phab.mercurial-scm.org/D8820
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 24 Jul 2020 16:18:39 +0530 |
parents | 1d6066336d7b |
children | c25efc468a49 |
line wrap: on
line source
# See http://EditorConfig.org for the specification root = true [*.py] indent_size = 4 indent_style = space trim_trailing_whitespace = true [*.{c,h}] indent_size = 8 indent_style = tab trim_trailing_whitespace = true [*.t] indent_size = 2 indent_style = space trim_trailing_whitespace = false