diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 18:05:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 18:08:52 +0100 |
| commit | 7457014be5d095aac55cabd24c82bf0e42641f3b (patch) | |
| tree | 4568bd5e2631b22b93ecef1fa0e056f573728f20 /xdiff-interface.h | |
| parent | Git 2.44 (diff) | |
| download | git-7457014be5d095aac55cabd24c82bf0e42641f3b.tar.xz git-7457014be5d095aac55cabd24c82bf0e42641f3b.zip | |
xdiff-interface: refactor parsing of merge.conflictstyle
Factor out the code that parses of conflict style name so it can be
reused in a later commit that wants to parse the name given on the
command line.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index e6f80df046..38537169b7 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -51,6 +51,7 @@ int buffer_is_binary(const char *ptr, unsigned long size); void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); void xdiff_clear_find_func(xdemitconf_t *xecfg); struct config_context; +int parse_conflict_style_name(const char *value); int git_xmerge_config(const char *var, const char *value, const struct config_context *ctx, void *cb); extern int git_xmerge_style; |