Merge branch 'rs/strbuf-setlen-assert'

diff --git a/diff.h b/diff.h
index b8dde8a750b17730f2e65da395700e5bd3ee2210..6fe1597785761b0e6961910214a129a2dde5197f 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;