Make "subtree" part more orthogonal to the rest of merge-recursive.

diff --git a/cache.h b/cache.h
index bf468e52352c193b355222b718d9f5125c26052c..c6902d2c22985df7178c0cb48afe0b776b1dde77 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -993,6 +993,7 @@ extern int diff_auto_refresh_index;
 
 /* match-trees.c */
 void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
+void shift_tree_by(const unsigned char *, const unsigned char *, unsigned char *, const char *);
 
 /*
  * whitespace rules.