diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-07 02:12:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-07 02:12:48 -0700 |
| commit | dd4bca39eccd01d93fe7916df3b8cb6f68629211 (patch) | |
| tree | ef13090eccd568874f4ee5c67ae3e0390766bb8a /combine-diff.c | |
| parent | Merge branch 'kh/svn' into next (diff) | |
| parent | blame -S <ancestry-file> (diff) | |
| download | git-dd4bca39eccd01d93fe7916df3b8cb6f68629211.tar.gz git-dd4bca39eccd01d93fe7916df3b8cb6f68629211.zip | |
Merge branch 'jc/blame' into next
* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.
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 4657eb4c33..eb0d757f47 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; |