diff options
author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:16:12 +0200 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:16:12 +0200 |
commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) | |
tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /ui-patch.c | |
parent | Merge branch 'jh/path-limit' (diff) | |
parent | ui-diff: Add links to increase/decrease number of context lines in diffs (diff) | |
download | cgit-pink-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz cgit-pink-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip |
Merge branch 'jh/context-lines'
Conflicts: cgit.c cgit.h
Diffstat (limited to 'ui-patch.c')
-rw-r--r-- | ui-patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-patch.c b/ui-patch.c index 25dc9fe..d13104c 100644 --- a/ui-patch.c +++ b/ui-patch.c @@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair) return; } if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, - &new_size, &binary, print_line)) + &new_size, &binary, 0, print_line)) html("Error running diff"); if (binary) html("Binary files differ\n"); |