contrib / subtree / .gitignoreon commit Merge branch 'al/mergetool-printf-fix' into maint (b79faa9)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj