index eff445596d98e46d40dd37843e690de27c5fabf1..eece65ddccdb7bd8bf51af80af92e29b4eb76f37 100644 (file)
--- a/diff.h
+++ b/diff.h
const char *base, const char *path);
extern void diff_unmerge(struct diff_options *,
- const char *path);
+ const char *path,
+ unsigned mode,
+ const unsigned char *sha1);
extern int diff_scoreopt_parse(const char *opt);
extern int run_diff_index(struct rev_info *revs, int cached);
+extern int do_diff_cache(const unsigned char *, struct diff_options *);
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
#endif /* DIFF_H */