Add builtin merge-file, a minimal replacement for RCS merge

diff --git a/Makefile b/Makefile
index 23bbb90683b5272ab65e9afd883307cacdff6b4a..79cb91feec2ff3a95438fb622f350cb2f965682d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -275,6 +275,7 @@ BUILTIN_OBJS = \
        builtin-ls-tree.o \
        builtin-mailinfo.o \
        builtin-mailsplit.o \
+       builtin-merge-file.o \
        builtin-mv.o \
        builtin-name-rev.o \
        builtin-pack-objects.o \