Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h

1 files changed, 2 insertions, 1 deletions

diff --git a/cgit.h b/cgit.h
index 80c3902..2b28d63 100644
--- a/cgit.h
+++ b/cgit.h
@@ -144,12 +144,13 @@ struct cgit_query {
         int   ofs;
         int nohead;
         char *sort;
         int showmsg;
         int ssdiff;
         int show_all;
+        int context;
         char *vpath;
 };
 
 struct cgit_config {
         char *agefile;
         char *cache_root;
@@ -275,13 +276,13 @@ extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
 
 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,
                            filepair_fn fn, const char *prefix);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);