index dc6da5e253c4a64440a2da9e2f785f3ea06bea61..da992dd4851dd67ab9a307c1b08ebed442e406cb 100644 (file)
--- a/diff.c
+++ b/diff.c
printf("%s ",
diff_unique_abbrev(p->two->sha1, abbrev));
}
- printf("%s%c%s", status, inter_name_termination, path_one);
+ printf("%s%c%s", status, inter_name_termination,
+ two_paths || p->one->mode ? path_one : path_two);
if (two_paths)
printf("%c%s", inter_name_termination, path_two);
putchar(line_termination);