tests/test-rhg.t

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

#require rust

  $ rhg() {
  > if [ -f "$RUNTESTDIR/../rust/target/debug/rhg" ]; then
  >   "$RUNTESTDIR/../rust/target/debug/rhg" "$@"
  > else
  >   echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg."
  >   exit 80
  > fi
  > }
  $ rhg unimplemented-command
  [252]
  $ rhg root
  abort: no repository found in '$TESTTMP' (.hg not found)!
  [255]
  $ hg init repository
  $ cd repository
  $ rhg root
  $TESTTMP/repository
  $ rhg root > /dev/full
  abort: No space left on device (os error 28)
  [255]
  $ rm -rf `pwd`
  $ rhg root
  abort: error getting current working directory: $ENOENT$
  [255]