mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -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:
parent
b7bd7e92a9
commit
0df2efa4d6
3 changed files with 7 additions and 1 deletions
|
|
@ -1046,4 +1046,3 @@ public class Foo
|
|||
{
|
||||
Object bar;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue