X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.c;h=ec94a96a5d02fe4204cc69f03de2966264378f75;hb=c2c07a5c2adf2aebc19b04a608592489b156a8bb;hp=823c8d0aabe7d68a6dd0c4b3311ecff64710ea6e;hpb=cf9dfc669e9bae724286d919dec0cd30e3f592e4;p=git.git diff --git a/diff.c b/diff.c index 823c8d0a..ec94a96a 100644 --- a/diff.c +++ b/diff.c @@ -174,7 +174,7 @@ static void builtin_diff(const char *name_a, { int i, next_at, cmd_size; const char *const diff_cmd = "diff -L%s -L%s"; - const char *const diff_arg = "%s %s||:"; /* "||:" is to return 0 */ + const char *const diff_arg = "-- %s %s||:"; /* "||:" is to return 0 */ const char *input_name_sq[2]; const char *label_path[2]; char *cmd; @@ -754,6 +754,9 @@ void diff_setup(struct diff_options *options) options->line_termination = '\n'; options->break_opt = -1; options->rename_limit = -1; + + options->change = diff_change; + options->add_remove = diff_addremove; } int diff_setup_done(struct diff_options *options)