Merge branch 'cb/add-pathspec'

diff --git a/diff.c b/diff.c
index 073131316041fa25790c1da27c0a526d1c1b3d66..82cff975b3512b6b31d78a31cfab4cca3d575cc5 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2474,6 +2474,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
                options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
        else if (!strcmp(arg, "--ignore-space-at-eol"))
                options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
+       else if (!strcmp(arg, "--patience"))
+               options->xdl_opts |= XDF_PATIENCE_DIFF;
 
        /* flags options */
        else if (!strcmp(arg, "--binary")) {