How to change merge mode for eclipse egit merge tool?

We work with Git and Eclipse. If I open a merge tool to resolve the conflict, I get this dialog:

enter image description here

I want to change this scam that I noted. Do not ask before. But just can't find the right preference page.

Where can I change this after the dialog is no longer displayed?

+4
source share
1 answer

You can change this in the Eclipse Git settings. Go to Window Preferences Team Git and you will see a drop-down list for the Merge Merge tool content .

+5
source

Source: https://habr.com/ru/post/1489655/


All Articles