A C standard library for sh3eb-elf.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

.gitattributes 613B

1234567891011121314151617181920
  1. # -*- conf -*-
  2. ## Set merge driver for ChangeLog files
  3. # See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1))
  4. # for per-user setup instructions.
  5. #
  6. # The short version of this (optional) procedure is:
  7. #
  8. # (1) Install git-merge-changelog (this is the tricky part!)
  9. #
  10. # (2) Add something like the following to your ~/.gitconfig:
  11. #
  12. # [merge "merge-changelog"]
  13. # name = GNU-style ChangeLog merge driver
  14. # driver = git-merge-changelog %O %A %B
  15. #
  16. # (3) Enjoy mostly effortless ChangeLog merges, at least until the
  17. # file gets renamed again ...
  18. ChangeLog merge=merge-changelog