Jonathan Tan writes:
> - else if (!strcmp(arg, "--patience"))
> + else if (!strcmp(arg, "--patience")) {
> + int i;
> options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
> - else if (!strcmp(arg, "--histogram"))
> +
Teach diff a new algorithm, one that attempts to prevent user-specified
lines from appearing as a deletion or addition in the end result. The
end user can use this by specifying "--anchored=" one or more
times when using Git commands like "diff" and "show".
Signed-off-by: Jonathan Tan
2 matches
Mail list logo