diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-07 05:29:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-07 05:29:55 (GMT) |
| commit | a0fd31463b8b391ff940e97706ba064608feb1e1 (patch) | |
| tree | f51d21982f36bcdc9c4f3c93310100ec0dc885d5 /combine-diff.c | |
| parent | f2f880f53707f83244c4659b6440224137aa0efa (diff) | |
| download | git-a0fd31463b8b391ff940e97706ba064608feb1e1.zip git-a0fd31463b8b391ff940e97706ba064608feb1e1.tar.gz git-a0fd31463b8b391ff940e97706ba064608feb1e1.tar.bz2 | |
Match ofs/cnt types in diff interface.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 4657eb4..eb0d757 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -151,7 +151,8 @@ static void append_lost(struct sline *sline, int n, const char *line, int len) struct combine_diff_state { struct xdiff_emit_state xm; - unsigned int lno, ob, on, nb, nn; + unsigned int lno; + int ob, on, nb, nn; unsigned long nmask; int num_parent; int n; |