contrib / subtree / .gitignoreon commit Merge branch 'jk/colors-fix' into maint (5d509d5)
   1*~
   2git-subtree
   3git-subtree.1
   4git-subtree.html
   5git-subtree.xml
   6mainline
   7subproj