Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / git-gui / .gitattributes
1 *           whitespace=indent-with-non-tab,trailing-space,space-before-tab,tabwidth=4
2 *           encoding=US-ASCII
3 git-gui.sh  encoding=UTF-8
4 /po/*.po    encoding=UTF-8