t / .gitignoreon commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1/trash directory
   2/test-results