Merge branch 'jc/maint-format-patch' into maint

diff --git a/diff-no-index.c b/diff-no-index.c
index 7d68b7f1bef1039b4996e662fb17968c4e3e3e79..b60d3455dae14a7a2cf2daeec8eb47fc7dcd9a09 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -252,6 +252,7 @@ void diff_no_index(struct rev_info *revs,
        if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
                       revs->diffopt.paths[1]))
                exit(1);
+       diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
        diffcore_std(&revs->diffopt);
        diff_flush(&revs->diffopt);