1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00

; 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.
This commit is contained in:
Jim Porter 2023-08-21 18:19:24 -07:00
parent b7bd7e92a9
commit 0df2efa4d6
3 changed files with 7 additions and 1 deletions

View file

@ -1046,4 +1046,3 @@ public class Foo
{
Object bar;
};