diff options
author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 23:16:12 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 23:16:12 (JST) |
commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) | |
tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /ui-patch.c | |
parent | 37a24e4e39737edaa5cdde501346a65eeb280e63 (diff) | |
parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
download | cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz |
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
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair) | |||
71 | return; | 71 | return; |
72 | } | 72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, print_line)) | 74 | &new_size, &binary, 0, print_line)) |
75 | html("Error running diff"); | 75 | html("Error running diff"); |
76 | if (binary) | 76 | if (binary) |
77 | html("Binary files differ\n"); | 77 | html("Binary files differ\n"); |