Code

checkout --conflict=<style>: recreate merge in a non-default style
[git.git] / .gitattributes
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace