Does IntelliJ provide three-way diff natively (ie. without an external merge tool being configured)?
The docs have plenty of references, but none of them actually pan out:
- Seems available only if the file you want to diff has changes: .html
- Only if you have configured the IDE as your Git merge tool of choice and you have a merge conflict: .html#resolve-merge-conflicts-in-ij