summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-12 20:24:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-12 20:24:48 (GMT)
commit02376287ffd8b37ea7622fd4b61d654855112e75 (patch)
tree012240009f9afed51301c938dae22c95ce3e72c7 /combine-diff.c
parent72c159f642a33255b76fff512f2a8c3aff9f5dca (diff)
parent3103c005207f0840782804b9387b3a831005bb9c (diff)
downloadgit-02376287ffd8b37ea7622fd4b61d654855112e75.zip
git-02376287ffd8b37ea7622fd4b61d654855112e75.tar.gz
git-02376287ffd8b37ea7622fd4b61d654855112e75.tar.bz2
Merge branch 'jc/combine' into next
* jc/combine: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test. combine-diff: type fix.
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 3a0ec61..9bd27f8 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)