Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h

cgit.h

@@ -147,6 +147,7 @@ struct cgit_query {
 	int showmsg;
 	int ssdiff;
 	int show_all;
+	int context;
 	char *vpath;
 };
 
@@ -278,7 +279,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,
 			   unsigned long *old_size, unsigned long *new_size,
-			   int *binary, linediff_fn fn);
+			   int *binary, int context, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,