Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h
This commit is contained in:
Lars Hjemli
2010-06-22 16:16:12 +02:00
7 changed files with 34 additions and 8 deletions

3
cgit.h
View File

@@ -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,