diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-13 21:25:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-14 07:04:26 (GMT) |
| commit | c279d7e9869740a6d64b0d1d70f7968af68d2071 (patch) | |
| tree | 039ed15f8db0c4747b7114881257c1d17a89925e /merge-file.c | |
| parent | 792c1583c8ab94c8cee77ca66685983259d7510e (diff) | |
| download | git-c279d7e9869740a6d64b0d1d70f7968af68d2071.zip git-c279d7e9869740a6d64b0d1d70f7968af68d2071.tar.gz git-c279d7e9869740a6d64b0d1d70f7968af68d2071.tar.bz2 | |
xdl_diff: identify call sites.
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>
Diffstat (limited to 'merge-file.c')
| -rw-r--r-- | merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-file.c b/merge-file.c index 1e031ea..2a939c9 100644 --- a/merge-file.c +++ b/merge-file.c @@ -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) |