X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-lib.c;h=ae96c64ca209f4df9008198e8a04b160bed618c7;hb=cc91e1bd0537442339c4fd233b98a4b30e9dbe29;hp=e7eaff9a68ccbcc692522c9956f0dae9af45f3f1;hpb=faf1dc7223be9ffddf775916913bb8e22762cdfb;p=git.git diff --git a/diff-lib.c b/diff-lib.c index e7eaff9a6..ae96c64ca 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -63,6 +63,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option) ? CE_MATCH_RACY_IS_DIRTY : 0); char symcache[PATH_MAX]; + diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); + if (diff_unmerged_stage < 0) diff_unmerged_stage = 2; entries = active_nr; @@ -469,6 +471,7 @@ int run_diff_index(struct rev_info *revs, int cached) if (unpack_trees(1, &t, &opts)) exit(128); + diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); return 0;