tests: add test of rebase with conflict in merge commit...
tests: add test of rebase with conflict in merge commit
It doesn't seem like we had any tests of this. I think it's pretty
weird that the two parents we're merging are not the working copy
parents during the conflict resolution.
Differential Revision:
https://phab.mercurial-scm.org/D7824
