contrib / diff-highlight / t / .gitignoreon commit Merge branch 'jc/cvsserver' into maint-2.10 (31add46)
   1/trash directory*
   2/test-results