contrib / subtree / .gitignoreon commit Merge branch 'jc/remove-treesame-parent-in-simplify-merges' (436b60c)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj