diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 18:57:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 19:48:10 +0300 |
commit | 32eaa4688387d37398f0bc498335355a28efb0c7 (patch) | |
tree | cef97cc234d7958b4c20d34e272baacdcc15ca48 /ll-merge.h | |
parent | 5adbb403c24880b758149378bc7874d7617db4bc (diff) |
ll-merge.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
-rw-r--r-- | ll-merge.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ll-merge.h b/ll-merge.h index b72b19921e..6c6e22e40d 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -7,6 +7,8 @@ #include "xdiff/xdiff.h" +struct index_state; + struct ll_merge_options { unsigned virtual_ancestor : 1; unsigned variant : 2; /* favor ours, favor theirs, or union merge */ @@ -19,8 +21,9 @@ int ll_merge(mmbuffer_t *result_buf, mmfile_t *ancestor, const char *ancestor_label, mmfile_t *ours, const char *our_label, mmfile_t *theirs, const char *their_label, + struct index_state *istate, const struct ll_merge_options *opts); -int ll_merge_marker_size(const char *path); +int ll_merge_marker_size(struct index_state *istate, const char *path); #endif |