diff: remove often unused parameters from diff_unmerge()

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index f51a8ee1b2a159814ce7fcca699b9895365ab2ff..3edb705b4dc6c7f8bb1febdb6440c96141232c01 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -209,10 +209,7 @@ extern void diff_change(struct diff_options *,
                        const char *fullpath,
                        unsigned dirty_submodule1, unsigned dirty_submodule2);
 
-extern struct diff_filepair *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