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-tree.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-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c index 7d4f628..e083246 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); } |