X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=blame.c;h=90338af31cf1f532891d8e34ede6c5cf9f72681f;hb=f067a13745fbeae1aa357876348a00e5edd0a629;hp=ffc1f52add2a29afbaae6b67bf43616caa1b0710;hpb=cfea8e077b9a8956080688ab40e9efd812c2a0c5;p=git.git diff --git a/blame.c b/blame.c index ffc1f52a..90338af3 100644 --- a/blame.c +++ b/blame.c @@ -92,7 +92,7 @@ static struct patch *get_patch(struct commit *commit, struct commit *other) die("write failed: %s", strerror(errno)); close(fd); - sprintf(diff_cmd, "diff -u0 %s %s", tmp_path1, tmp_path2); + sprintf(diff_cmd, "diff -U 0 %s %s", tmp_path1, tmp_path2); fin = popen(diff_cmd, "r"); if (!fin) die("popen failed: %s", strerror(errno)); @@ -234,7 +234,7 @@ static void print_patch(struct patch *p) } } -#if 0 +#if DEBUG /* For debugging only */ static void print_map(struct commit *cmit, struct commit *other) {