For anyone using JetBrains tools like IntelliJ or similar, note that they all include a nice diff/merge tool: https://www.jetbrains.com/help/idea/running-intell

For anyone using JetBrains tools like IntelliJ or similar, note that they all include a nice diff/merge tool: https://www.jetbrains.com/help/idea/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html https://www.jetbrains.com/help/idea/running-intellij-idea-as...