OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
gitweb: Convert generated contents to utf8 in commitdiff_plain
[git-core/git.git]
/
merge-tree.c
diff --git
a/merge-tree.c
b/merge-tree.c
index
7d4f628
..
e083246
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);
}