modify/delete conflict resolution overwrites untracked file
[git] / .gitattributes
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace