5

In the Synchronize tab of the Eclipse Team Synchronization perspective, double-clicking a file shows the built-in 2-way diff/merge editor. If I install an external merge utility, this is not used in the Team Synchronization perspective--it can only be accessed from the Edit Conflicts... menu item. It would be much nicer to have a 3-way merge tool appear as the editor inside Team Synchronization. Does anyone know of a way to configure Eclipse to do this? Thanks in advance.

Byron

Byron Hawkins
  • 2,536
  • 2
  • 24
  • 34
  • Hi Byron, did you ever solve this? Have been struggling to find a solution to this myself. When you say you can access external merge tool from the Edit Conflicts menu item, where is this in Eclipse? – Ben Sep 01 '10 at 22:21
  • There's an "edit conflicts" dialog within the Perforce plugin. I miss SVN. – Mark Storer Feb 01 '11 at 23:31

2 Answers2

1

Subversive plugin for SVN can help out. Check this link for configuring subversive to use an external diff tool.

Faisal Feroz
  • 12,458
  • 4
  • 40
  • 51
0

If you want to integrate Beyond Compare tool inside Eclipse, use the link and install eclipse plugin.

Please look at this answer also Need help configuring external diff with Eclipse

Community
  • 1
  • 1
Rajesh
  • 1,911
  • 1
  • 22
  • 19