Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-14 00:25:07 +0300
committerJunio C Hamano <gitster@pobox.com>2007-12-14 10:04:26 +0300
commitc279d7e9869740a6d64b0d1d70f7968af68d2071 (patch)
tree039ed15f8db0c4747b7114881257c1d17a89925e /merge-tree.c
parent792c1583c8ab94c8cee77ca66685983259d7510e (diff)
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-tree.c')
-rw-r--r--merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c
index 7d4f628444..e08324686c 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -119,7 +119,7 @@ static void show_diff(struct merge_list *entry)
if (!dst.ptr)
size = 0;
dst.size = size;
- xdl_diff(&src, &dst, &xpp, &xecfg, &ecb);
+ xdi_diff(&src, &dst, &xpp, &xecfg, &ecb);
free(src.ptr);
free(dst.ptr);
}