contrib / subtree / .gitignoreon commit Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint (bc60f9f)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj