Mandark
Mandark

Reputation: 828

Use IntelijJ as default diff/merge tool in Eclipse

Has anyone maybe used Intelij as the default merge/diff tool in Eclipse?

I don't know what parameters should be used in the highlighted fields below.

enter image description here

EDIT:

enter image description here

Upvotes: 1

Views: 286

Answers (1)

Mickael
Mickael

Reputation: 3596

See https://www.jetbrains.com/help/idea/2016.2/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html about what kind of command-line parameters IntelliJ expects for the diff/merge: it seems like you have to add a diff argument first and then use the ${file1Path} and other placeholders separated with spaces, without using any comma nor and.

Upvotes: 2

Related Questions