Git “You have not concluded your merge” and nothing to commit?

Okay I finally found answer: git commit -m "Test" apparently fixed this. The result was an empty commit with no changes whatsoever. Even Github shows an empty commit, but it works.