2 ms·

Depending on the format of your files, entries like "changelog merge=union" in your .gitattributes file might work for you.