aboutsummaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-08-17 11:41:41 -0700
committerJunio C Hamano <gitster@pobox.com>2019-08-19 10:08:04 -0700
commit5bf7e5779ec6d5293b3135554d49e6fcee88d399 (patch)
tree3e55a11dc2ee8d9c3423038af1deab6bcdd58795 /cache-tree.c
parente95e481f9e6e4dfe62380ccc8a47acf446403a94 (diff)
downloadgit-5bf7e5779ec6d5293b3135554d49e6fcee88d399.tar.xz
merge-recursive: split internal fields into a separate struct
merge_options has several internal fields that should not be set or read by external callers. This just complicates the API. Move them into an opaque merge_options_internal struct that is defined only in merge-recursive.c and keep these out of merge-recursive.h. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
0 files changed, 0 insertions, 0 deletions