Mercurial > hg
comparison hgeditor @ 45277:c515c54f6530
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 | 1aee2ab0f902 |
children |
comparison
equal
deleted
inserted
replaced
45276:cb6a72dc0511 | 45277:c515c54f6530 |
---|