Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h

1 file changed, 1 insertion, 1 deletion

diff --git a/ui-patch.c b/ui-patch.cindex 25dc9fed..d13104cf 100644--- a/ui-patch.c+++ b/ui-patch.c@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair) 		return; 	} 	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,-			    &new_size, &binary, print_line))+			    &new_size, &binary, 0, print_line)) 		html("Error running diff"); 	if (binary) 		html("Binary files differ\n");
diff --git a/ui-patch.c b/ui-patch.c
index 25dc9fed..d13104cf 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair)
 		return;
 	}
 	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-			    &new_size, &binary, print_line))
+			    &new_size, &binary, 0, print_line))
 		html("Error running diff");
 	if (binary)
 		html("Binary files differ\n");