teach diff machinery about --ignore-space-at-eol

diff --git a/Makefile b/Makefile
index e38cb9f61cad4ab6798289aaccf689d5a3e5b089..d66126d7ecce3b032e106342c46322e4cdcc3973 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -291,6 +291,7 @@ BUILTIN_OBJS = \
        builtin-ls-tree.o \
        builtin-mailinfo.o \
        builtin-mailsplit.o \
+       builtin-merge-base.o \
        builtin-merge-file.o \
        builtin-mv.o \
        builtin-name-rev.o \