diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 10:08:52 -0700 |
| commit | 7457014be5d095aac55cabd24c82bf0e42641f3b (patch) | |
| tree | 4568bd5e2631b22b93ecef1fa0e056f573728f20 /merge-recursive.c | |
| parent | Git 2.44 (diff) | |
| download | git-7457014be5d095aac55cabd24c82bf0e42641f3b.tar.gz 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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions