Code

t9901: fix line-ending dependency on windows
[git.git] / diff.c
diff --git a/diff.c b/diff.c
index eed227a6ace278c47a68082015d942dc2fe9cba5..d922b77aef2da84824a8e14fc21961e36e6d2e36 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3387,6 +3387,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"))