X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=blame.c;h=90338af31cf1f532891d8e34ede6c5cf9f72681f;hb=197e8951abd2ebf2c70d0847bb0b38b16b92175b;hp=fca22f900099b1a9c1c6450d991392e19292f178;hpb=604c86d15bb319a1e93ba218fca48ce1c500ae52;p=git.git

diff --git a/blame.c b/blame.c
index fca22f90..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 -u -U 0 %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)
 {