tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

diff --git a/builtin.h b/builtin.h
index d4afbfe4187ad45ac9586c9e6f05541cbe67196b..c47c110e0f18f3183d54c9afb63cffef686a21db 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -27,6 +27,8 @@ extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 
 extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
 
+extern int is_builtin(const char *s);
+
 extern int cmd_add(int argc, const char **argv, const char *prefix);
 extern int cmd_annotate(int argc, const char **argv, const char *prefix);
 extern int cmd_apply(int argc, const char **argv, const char *prefix);