Can't seem to find an option to enable this. A thr...

# random

[okkero]

Can't seem to find an option to enable this. A three-way git merge is one with 4 views: local, remote, base (the latest common commit between local and remote), and result