Git merging within a line

Question

Preamble

I\'m using git as a version control system for a paper that my lab is writing, in LaTeX. There are several people collaborating.

I\

Answer 1

I believe the git merge algorithm is quite simple (even though you can make it work harder with the "patience" merge strategy).
Its work item will remain the line.

But the general idea is to delegate any fine-grained detection§resolution mechanism to a third-party tool you can setup with git config mergetool.
If some words within a long line differs, that external tool (KDiff3, DiffMerge, ...) will be able to pick up that change and present it to you.