diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-12 22:23:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-12 22:23:50 +0200 |
| commit | 8bc7574b6332ef45645c6e0917e9d59919b277ef (patch) | |
| tree | a24880a4d8368ce8adb1fe311344f304b2bd81ed | |
| parent | combine-diff: fix hunks at the end (take #2). (diff) | |
| download | git-8bc7574b6332ef45645c6e0917e9d59919b277ef.tar.xz git-8bc7574b6332ef45645c6e0917e9d59919b277ef.zip | |
combine-diff: type fix.
The variable hunk_end points at a line number, which is
represented as unsigned long by all the other variables.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | combine-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index c45d773659..e519583650 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -506,8 +506,8 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent) while (1) { struct sline *sl = &sline[lno]; - int hunk_end; - int rlines; + unsigned long hunk_end; + unsigned long rlines; while (lno <= cnt && !(sline[lno].flag & mark)) lno++; if (cnt < lno) |