cvsserver: Add support for packed refs

diff --git a/builtin-merge.c b/builtin-merge.c
index 2ee16746908179960fcd57dc16d042d24f741833..129b4e62dd3bc3662f8f076e39c90b109f4bd669 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -21,6 +21,7 @@
 #include "utf8.h"
 #include "log-tree.h"
 #include "color.h"
+#include "rerere.h"
 
 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)