Ralf Jung 4a60706e61 Revert "Stop git from merging generated files" ...

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

2024-12-12 07:20:11 +01:00

18 lines

421 B

Plaintext

Raw Blame History