| commit | a0fd31463b8b391ff940e97706ba064608feb1e1 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Thu Apr 06 22:29:55 2006 -0700 |
| committer | Junio C Hamano <junkio@cox.net> | Thu Apr 06 22:29:55 2006 -0700 |
| tree | f51d21982f36bcdc9c4f3c93310100ec0dc885d5 | |
| parent | f2f880f53707f83244c4659b6440224137aa0efa [diff] [blame] |
Match ofs/cnt types in diff interface. Signed-off-by: Junio C Hamano <junkio@cox.net>
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 @@ 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;