git-gui / .gitattributeson commit Merge branch 'jc/better-conflict-resolution' (9ba929e)
   1*           encoding=US-ASCII
   2git-gui.sh  encoding=UTF-8
   3/po/*.po    encoding=UTF-8