]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c2a3fd) | patch
xdiff-interface: refactor parsing of merge.conflictstyle
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Thu, 14 Mar 2024 17:05:03 +0000 (17:05 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Mar 2024 17:08:52 +0000 (10:08 -0700)
commit7457014be5d095aac55cabd24c82bf0e42641f3b
tree4568bd5e2631b22b93ecef1fa0e056f573728f20tree
parent3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0commit | diff
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>
xdiff-interface.c diff | blob | blame | history
xdiff-interface.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.