tests: add test showing that merge state is not cleared by amend...
tests: add test showing that merge state is not cleared by amend
This is slightly modified version of the test case I provided in
issue6304.
Differential Revision:
https://phab.mercurial-scm.org/D8931