Merge branch 'jc/cherry-pick' (early part)

diff --git a/Makefile b/Makefile
index 7fbb81578264e47c83857e864e58b32c4f81a5fa..514738046f94abc9ab16bfebc3b0d3e0118b5a5f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -308,7 +308,7 @@ LIB_H = \
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
        tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
        utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
-       mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h \
+       mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h fsck.h \
        pack-revindex.h
 
 DIFF_OBJS = \
@@ -333,7 +333,7 @@ LIB_OBJS = \
        color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
        convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \
        transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \
-       alias.o fsck.o pack-revindex.o
+       ll-merge.o alias.o fsck.o pack-revindex.o
 
 BUILTIN_OBJS = \
        builtin-add.o \