Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Reduce the number of connects when fetching
[gitweb.git]
/
merge-tree.c
diff --git
a/merge-tree.c
b/merge-tree.c
index 7d4f628444058d80e798e141285d558fb7104c5b..e08324686cc090fa9bd94d7f069b025454c7acdf 100644
(file)
--- 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;
- xd
l
_diff(&src, &dst, &xpp, &xecfg, &ecb);
+ xd
i
_diff(&src, &dst, &xpp, &xecfg, &ecb);
free(src.ptr);
free(dst.ptr);
}