X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;h=eb0d757f47b74161c4bfc1212f4510a6790ff92a;hb=a0fd31463b8b391ff940e97706ba064608feb1e1;hp=4657eb4c33b2711dffe99fe1e8a4e19608761ce3;hpb=f2f880f53707f83244c4659b6440224137aa0efa;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index 4657eb4c..eb0d757f 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;