t / .gitignoreon commit Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix (60c9118)
   1/trash directory*
   2/test-results