rebase: use the new git-rebase--preserve-merges.sh

diff --git a/unpack-trees.h b/unpack-trees.h
index 41178ada94a4b7c5222cab7dd17d9eeb7a1956e4..6c48117b845fbf7b983852be302e4472c5e6d651 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -1,7 +1,6 @@
 #ifndef UNPACK_TREES_H
 #define UNPACK_TREES_H
 
-#include "tree-walk.h"
 #include "string-list.h"
 
 #define MAX_UNPACK_TREES 8
@@ -79,9 +78,6 @@ struct unpack_trees_options {
 extern int unpack_trees(unsigned n, struct tree_desc *t,
                struct unpack_trees_options *options);
 
-int verify_uptodate(const struct cache_entry *ce,
-                   struct unpack_trees_options *o);
-
 int threeway_merge(const struct cache_entry * const *stages,
                   struct unpack_trees_options *o);
 int twoway_merge(const struct cache_entry * const *src,