mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
Storing that a file is resolved for the other parent while merging is just one
case of things we will like to store in the mergestate. There are more which we
will like to store.
This patch replaces `addmergedother()` with a much more generic
`addcommitinfo()`. Doing this, we also blinding stores the same key value pair
generated by the merge code instead of touching them.
Differential Revision: https://phab.mercurial-scm.org/D8923
# Balto (https://bitbucket.org/lothiraldan/balto/src) is a test orchestrator
# which is compatible with all test runner that can emit the LITF
# (https://github.com/lothiraldan/litf) test format.
# The plugin for the Mercurial test runner is mercurial-litf
# (https://pypi.org/project/mercurial-litf/). Make sure to follow the
# instruction and configuration instructions here:
# https://bitbucket.org/lothiraldan/mercurial_litf/src/default/
# You can launch Balto with `balto /path/to/mercurial/tests/`
name = "Mercurial Test Suite"
tool = "mercurial"