Edit Conflicts (Team menu)

Uses the graphical editor build into Eclipse to resolve the conflicts between your working copy and the remote repository contents.