index 815987de52627d9762aa43cefd1ce897007f8ce5..7473c522846068b8e4ea3a4f4a62eba239b0e90e 100644 (file)
--- a/diff.h
+++ b/diff.h
extern void diff_unmerge(const char *path);
-/* These are for diff-helper */
+extern int diff_scoreopt_parse(const char *opt);
-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 diff_setup(int detect_rename, int minimum_score,
+ const char *pickaxe,
+ int reverse, int raw_output,
+ const char **spec, int cnt);
-extern void run_external_diff(const char *name, const char *other,
- struct diff_spec *, struct diff_spec *);
+extern void diff_flush(void);
#endif /* DIFF_H */