Sublime Merge

Key features

• line-by-line and partial file (hunk) staging
• show changes in submodules

Cons

• same as Sublime Text, when using without a license there will be pop-ups encouraging to buy it (currently 99USD)
• some limitations without license: adjustments to UI seem to reset, no dark mode