Merge branch 'maint-1.7.6' into maint

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index fcc0078074c364d0a4c2bd75a6d390e517eb7f87..977ca7125b9acc603ce6c1d27c57a75c9d21fbdf 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3385,6 +3385,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
        }
 
        /* xdiff options */
+       else if (!strcmp(arg, "--minimal"))
+               DIFF_XDL_SET(options, NEED_MINIMAL);
+       else if (!strcmp(arg, "--no-minimal"))
+               DIFF_XDL_CLR(options, NEED_MINIMAL);
        else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
                DIFF_XDL_SET(options, IGNORE_WHITESPACE);
        else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))