+extern void diff_unmerge(const char *path);
+
+/* These are for diff-tree-helper */
+
+struct diff_spec {
+ unsigned char blob_sha1[20];
+ unsigned short mode; /* file mode */
+ unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
+ * however with a NULL SHA1, read them
+ * from the file system.
+ * if false, use the name and read mode from
+ * the filesystem.
+ */
+ unsigned file_valid : 1; /* if false the file does not even exist */
+};
+
+extern void run_external_diff(const char *name,
+ struct diff_spec *, struct diff_spec *);