index 6fe1597785761b0e6961910214a129a2dde5197f..d83e53e9d465ba73808ff5071b17b7f13ad27b09 100644 (file)
--- a/diff.h
+++ b/diff.h
const char *fullpath,
unsigned dirty_submodule1, unsigned dirty_submodule2);
-extern void diff_unmerge(struct diff_options *,
- const char *path,
- unsigned mode,
- const unsigned char *sha1);
+extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2