summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-13 21:25:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-14 07:04:26 (GMT)
commitc279d7e9869740a6d64b0d1d70f7968af68d2071 (patch)
tree039ed15f8db0c4747b7114881257c1d17a89925e /combine-diff.c
parent792c1583c8ab94c8cee77ca66685983259d7510e (diff)
downloadgit-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 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 5a658dc..e22db89 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -226,7 +226,7 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
state.num_parent = num_parent;
state.n = n;
- xdl_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
+ xdi_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
free(parent_file.ptr);
/* Assign line numbers for this parent.