blob: 21ac7ef2f130eb3be46a46618a488df55812ad53 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
#ifndef MERGE_H
#define MERGE_H
struct commit_list;
struct object_id;
struct repository;
int try_merge_command(struct repository *r,
const char *strategy, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes);
int checkout_fast_forward(struct repository *r,
const struct object_id *from,
const struct object_id *to,
int overwrite_ignore);
#endif /* MERGE_H */
|
