Comment Comment by lozenge This solution is neat, but Git also has a very simple built in solution: https://git-scm.com/docs/gitattributes#gitattributes-union parent lozenge 8 years ago
