projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.27.0
[platform/upstream/git.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index
d65a897
..
1ec0b95
100644
(file)
--- a/
ll-merge.c
+++ b/
ll-merge.c
@@
-247,7
+247,7
@@
static int read_merge_config(const char *var, const char *value, void *cb)
{
struct ll_merge_driver *fn;
const char *key, *name;
-
in
t namelen;
+
size_
t namelen;
if (!strcmp(var, "merge.default"))
return git_config_string(&default_ll_merge, var, value);