diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 775ebe2182..08c1c36d33 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -456,7 +456,7 @@ static void unpack_trees_finish(struct merge_options *opt) clear_unpack_trees_porcelain(&opt->priv->unpack_opts); } -static int save_files_dirs(const struct object_id *oid, +static int save_files_dirs(const struct object_id *UNUSED(oid), struct strbuf *base, const char *path, unsigned int mode, void *context) { |