tests: add test of committing with conflicts but no changes in wdir

I'm about to change the behavior slightly here, so let's have a test
that shows that.

Differential Revision: https://phab.mercurial-scm.org/D8194