diff options
| author | Helmut Eller | 2026-02-13 09:10:16 +0100 |
|---|---|---|
| committer | Helmut Eller | 2026-02-13 09:10:16 +0100 |
| commit | 91c9e9883488d715a30877dfd7641ef4b3c62658 (patch) | |
| tree | e2c4525147e443f86baf9d0144aeadec082d7564 /.gitattributes | |
| parent | 9a4a54af9192a6653164364c75721ee814ffb1e8 (diff) | |
| parent | f1fe4d46190263e164ccd1e066095d46a156297f (diff) | |
| download | emacs-feature/igc.tar.gz emacs-feature/igc.zip | |
Merge branch 'master' into feature/igcfeature/igc
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index aace7545c99..5353236943e 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -25,6 +25,7 @@ admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol | |||
| 25 | test/manual/etags/c-src/dostorture.c whitespace=cr-at-eol | 25 | test/manual/etags/c-src/dostorture.c whitespace=cr-at-eol |
| 26 | test/manual/etags/cp-src/c.C whitespace=cr-at-eol | 26 | test/manual/etags/cp-src/c.C whitespace=cr-at-eol |
| 27 | test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol | 27 | test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol |
| 28 | test/lisp/calendar/icalendar-resources/*.ics whitespace=cr-at-eol | ||
| 28 | 29 | ||
| 29 | # The todo-mode file format includes trailing whitespace. | 30 | # The todo-mode file format includes trailing whitespace. |
| 30 | *.tod[aorty] -whitespace=blank-at-eol | 31 | *.tod[aorty] -whitespace=blank-at-eol |