Revert "Stop git from merging generated files"

This reverts commit 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e.
"-merge" makes git not even do merges if they are entirely conflict-free,
which is not the behavior we want.