diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2023-08-21 18:19:24 -0700 |
|---|---|---|
| committer | Jim Porter <jporterbugs@gmail.com> | 2023-08-21 18:22:59 -0700 |
| commit | 0df2efa4d6953fb3dbc50c5faa845e80154b447b (patch) | |
| tree | a267efeb67f5d4c1ea87a54724a27ca2ad4aed65 /.gitattributes | |
| parent | b7bd7e92a969f012c8e6ad8d0cdbffd758054cab (diff) | |
| download | emacs-0df2efa4d6953fb3dbc50c5faa845e80154b447b.tar.gz | |
; Fix issues running gitmerge
* .gitattributes: Ignore whitespace issues in java/INSTALL.
* build-aux/git-hooks/pre-commit (git_diff): Explicitly allow
"ChangeLog.android".
* java/README: Remove extra trailing newline.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index b56f0ec617d..39a82cc0efc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -116,3 +116,7 @@ build-aux/msys-to-w32 diff=shell build-aux/update-subdirs diff=shell lib-src/rcs2log diff=shell /make-dist diff=shell + +# This file contains in-line diffs, which can include trailing +# whitespace. +java/INSTALL -whitespace |