Make "git commit" work correctly in the presense of a manual merge