contrib / subtree / .gitignoreon commit Merge branch 'da/p4merge-mktemp' into maint (a8e00d7)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj