diff options
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -44,8 +44,8 @@ int try_merge_command(const char *strategy, size_t xopts_nr, return ret; } -int checkout_fast_forward(const unsigned char *head, - const unsigned char *remote, +int checkout_fast_forward(const struct object_id *head, + const struct object_id *remote, int overwrite_ignore) { struct tree *trees[MAX_UNPACK_TREES]; |