submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
[git/dscho.git] / git-gui / .gitattributes
blob33d07c06bd90833ce56bc64c13bdc08c1997c3fb
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