diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-27 02:43:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-27 02:43:46 -0800 |
| commit | 37818d7db070f67a20df58ac7d5e04cc63ef1867 (patch) | |
| tree | 1b1b2b71afab1c4ad29666f56fa8d2560b7855c6 /xdiff/xdiffi.c | |
| parent | 4bcb310c2539b66d535e87508d1b7a90fe29c083 (diff) | |
| parent | ae72f685418b79bbd67e1017c5b1ac7d731c042e (diff) | |
| download | git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.gz git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.xz | |
Merge branch 'master' into js/shallow
This is to adjust to:
count-objects -v: show number of packs as well.
which will break a test in this series.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff/xdiffi.c')
| -rw-r--r-- | xdiff/xdiffi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index d76e76a0e..9aeebc473 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -45,7 +45,6 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, long *kvdf, long *kvdb, int need_min, xdpsplit_t *spl, xdalgoenv_t *xenv); static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1, long chg2); -static int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags); @@ -397,7 +396,7 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1, } -static int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { +int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { long ix, ixo, ixs, ixref, grpsiz, nrec = xdf->nrec; char *rchg = xdf->rchg, *rchgo = xdfo->rchg; xrecord_t **recs = xdf->recs; |