Fix overzealous cleanliness check in git-merge