templates / info--excludeon commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1# git ls-files --others --exclude-from=.git/info/exclude
   2# Lines that start with '#' are comments.
   3# For a project mostly in C, the following would be a good set of
   4# exclude patterns (uncomment them if you want to use them):
   5# *.[oa]
   6# *~