Typo, 'conflit'. But actually I find the sentence still rather hard to read, let's see if I can help...
"""
Because mergetool and config itself both use curly braces as interpolation markers, trying to display the mergetool line results in the following problem:
...
To avoid this, config can be instructed not to try expanding variables:
...
"""
Something like that? This is user-focused after all, so they shouldn't really care too much about the details.
Typo, 'conflit'. But actually I find the sentence still rather hard to read, let's see if I can help...
"""
Because mergetool and config itself both use curly braces as interpolation markers, trying to display the mergetool line results in the following problem:
...
To avoid this, config can be instructed not to try expanding variables:
...
"""
Something like that? This is user-focused after all, so they shouldn't really care too much about the details.