Phillip Wood 7457014be5 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>

2024-03-14 10:08:52 -07:00

7.8 KiB

Raw Blame History

View Raw