contrib / subtree / .gitignoreon commit Merge branch 'dl/am-hg-locale' (738b314)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj