contrib / subtree / .gitignoreon commit Merge branch 'jc/color-diff-doc' (3e1b08b)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj