t / t1509 / excludeson commit merge-recursive: Consider modifications in rename/rename(2to1) conflicts (434b852)
   1*.o
   2*~
   3*.bak
   4*.c
   5*.h
   6.git
   7contrib
   8Documentation
   9git-gui
  10gitk-git
  11gitweb
  12t/t4013
  13t/t5100
  14t/t5515