merge-one-file: force content conflict for "both sides added" case
[git.git] / t / .gitattributes
blob1b97c5465b7d9e4404e11668b44c5c507a302d4a
1 t[0-9][0-9][0-9][0-9]/* -whitespace