Mercurial > hg

diff .editorconfig @ 45277:c515c54f6530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove no longer required ACTION_GET_OTHER_AND_STORE In 1b8fd4af33189c84feadb47c74d659ec31cde3b9 I (ab)used merge actions to pass info from manifestmerge() to applyupdates() and store info in mergestate. In previous patches, we introduced a separate return value from manifestmerge() and calculateupdates() and an argument to applyupdates() which achieved the same thing. Let's remove this no longer required messy code. Differential Revision: https://phab.mercurial-scm.org/D8744
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 14 Jul 2020 16:40:28 +0530
parents 1d6066336d7b
children c25efc468a49
line wrap: on
line diff