contrib / subtree / .gitignoreon commit Merge branch 'ap/maint-diff-rename-avoid-overlap' (caf217a)
   1*~
   2git-subtree
   3git-subtree.xml
   4git-subtree.1
   5mainline
   6subproj