aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.h
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2010-06-22 23:16:12 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2010-06-22 23:16:12 (JST)
commit6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch)
tree49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /cgit.h
parent37a24e4e39737edaa5cdde501346a65eeb280e63 (diff)
parentd20313e3daf855ee5d4808e050f54614c200d7b1 (diff)
downloadcgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip
cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz
Merge branch 'jh/context-lines'
Conflicts: cgit.c cgit.h
Diffstat (limited to 'cgit.h')
-rw-r--r--cgit.h3
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
@@ -147,6 +147,7 @@ struct cgit_query {
147 int showmsg; 147 int showmsg;
148 int ssdiff; 148 int ssdiff;
149 int show_all; 149 int show_all;
150 int context;
150 char *vpath; 151 char *vpath;
151}; 152};
152 153
@@ -278,7 +279,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
278extern int cgit_diff_files(const unsigned char *old_sha1, 279extern int cgit_diff_files(const unsigned char *old_sha1,
279 const unsigned char *new_sha1, 280 const unsigned char *new_sha1,
280 unsigned long *old_size, unsigned long *new_size, 281 unsigned long *old_size, unsigned long *new_size,
281 int *binary, linediff_fn fn); 282 int *binary, int context, linediff_fn fn);
282 283
283extern void cgit_diff_tree(const unsigned char *old_sha1, 284extern void cgit_diff_tree(const unsigned char *old_sha1,
284 const unsigned char *new_sha1, 285 const unsigned char *new_sha1,