Update draft release notes to 1.7.6

diff --git a/diff.h b/diff.h
index b8dde8a750b17730f2e65da395700e5bd3ee2210..d83e53e9d465ba73808ff5071b17b7f13ad27b09 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -104,6 +104,7 @@ struct diff_options {
        int interhunkcontext;
        int break_opt;
        int detect_rename;
+       int irreversible_delete;
        int skip_stat_unmatch;
        int line_termination;
        int output_format;
@@ -209,10 +210,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