mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdl_diff: identify call sites.

Browse Source 
This inserts a new function xdi_diff() that currently does not
do anything other than calling the underlying xdl_diff() to the
callchain of current callers of xdl_diff() function.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2007-12-13 13:25:07 -08:00
parent 792c1583c8
commit c279d7e986
8 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-file.c
View File

@ -71,7 +71,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
res->size = 0;
ecb.priv = res;
return xdl_diff(f1, f2, &xpp, &xecfg, &ecb);
return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
}
void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size)