match-trees: use hashcpy to splice trees

diff --git a/diff.h b/diff.h
index 3197a976a4d9290ca8c98e94951c62b3abad84ef..412138ba085ccc3b998b704b2e6103db4313ed0d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -461,7 +461,7 @@ size_t fill_textconv(struct repository *r,
  * and only if it has textconv enabled (otherwise return NULL). The result
  * can be passed to fill_textconv().
  */
-struct userdiff_driver *get_textconv(struct index_state *istate,
+struct userdiff_driver *get_textconv(struct repository *r,
                                     struct diff_filespec *one);
 
 /*