Merge branch 'rr/core-tutorial'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index cf0723ea122b09c66a6da367a653381966729847..ad890ec9254617e2b4a6cfb35ec91b44ebd8f37a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -497,6 +497,7 @@ LIB_H += reflog-walk.h
 LIB_H += refs.h
 LIB_H += remote.h
 LIB_H += rerere.h
+LIB_H += resolve-undo.h
 LIB_H += revision.h
 LIB_H += run-command.h
 LIB_H += sha1-lookup.h
@@ -592,6 +593,7 @@ LIB_OBJS += refs.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace_object.o
 LIB_OBJS += rerere.o
+LIB_OBJS += resolve-undo.o
 LIB_OBJS += revision.o
 LIB_OBJS += run-command.o
 LIB_OBJS += server-info.o