Eclipse Community Forums: EGit / JGit » Is it possible to use git merge.conflictstyle=diff3 in Eclipse?

Help

Home » Eclipse Projects » EGit / JGit » Is it possible to use git merge.conflictstyle=diff3 in Eclipse?

Sat, 02 August 2014 06:19

Messages: 2
Registered: August 2014

Junior Member

It works fine for me outside Eclipse. I have also set the setting in Eclipse, but it does not change anything.

Tue, 05 August 2014 07:20

Messages: 1268
Registered: July 2009

Senior Member

AFAIK that's not yet implemented in JGit, feel free to file an enhancement request in Bugzilla

Thu, 21 August 2014 15:57

Messages: 2
Registered: August 2014

Junior Member

Thank you for the answer. I did file an enhancement request in Bugzilla.

Tue, 10 October 2017 08:47

Messages: 1
Registered: October 2017

Junior Member

Is this bug fixed?

Mon, 16 October 2017 19:21

Messages: 1268
Registered: July 2009

Senior Member

no bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=442284 is still open since nobody did the implementation

Previous Topic:	diff between master/PR branch and release branch
Next Topic:	Non-fast-forward reject caused loss

Goto Forum:

]

Current Time: Thu Apr 25 20:23:21 GMT 2024

.:: Contact :: Home ::.

Sign up to our Newsletter