diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 54c7660db..e2f1e388d 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2564,7 +2564,7 @@ done: return error; } -int merge_config(git_merge_config_t *out, git_repository *repo) +static int merge_config(git_merge_config_t *out, git_repository *repo) { git_config *config; const char *value; |