1 files changed, 1 insertions, 4 deletions
diff --git a/diff.h b/diff.h
index 007a0554d4..42b49d8f22 100644
--- a/diff.h
+++ b/diff.h
@@ -208,10 +208,7 @@ extern void diff_change(struct diff_options *,
 			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