diff options
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; |