| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
| commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) (side-by-side diff) | |
| tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /cgit.h | |
| parent | 37a24e4e39737edaa5cdde501346a65eeb280e63 (diff) | |
| parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
| download | cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.bz2 | |
Merge branch 'jh/context-lines'
Conflicts:
cgit.c
cgit.h
| -rw-r--r-- | cgit.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); |