Merge branch 'jc/merge-base' (early part)

diff --git a/Makefile b/Makefile
index 6a9431331af1476ca1333c53a279254290b7b87f..d66126d7ecce3b032e106342c46322e4cdcc3973 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -280,7 +280,6 @@ BUILTIN_OBJS = \
        builtin-diff.o \
        builtin-diff-files.o \
        builtin-diff-index.o \
-       builtin-diff-stages.o \
        builtin-diff-tree.o \
        builtin-fmt-merge-msg.o \
        builtin-for-each-ref.o \
@@ -292,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 \