Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Is it possible to use git merge.conflictstyle=diff3 in Eclipse?
icon4.gif  Is it possible to use git merge.conflictstyle=diff3 in Eclipse? [message #1404499] Sat, 02 August 2014 06:19 Go to next message
Helge Priva is currently offline Helge PrivaFriend
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.
Re: Is it possible to use git merge.conflictstyle=diff3 in Eclipse? [message #1404700 is a reply to message #1404499] Tue, 05 August 2014 07:20 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1026
Registered: July 2009
Senior Member
AFAIK that's not yet implemented in JGit, feel free to file an enhancement request in Bugzilla
Re: Is it possible to use git merge.conflictstyle=diff3 in Eclipse? [message #1410786 is a reply to message #1404700] Thu, 21 August 2014 15:57 Go to previous messageGo to next message
Helge Priva is currently offline Helge PrivaFriend
Messages: 2
Registered: August 2014
Junior Member
Thank you for the answer. I did file an enhancement request in Bugzilla.
Re: Is it possible to use git merge.conflictstyle=diff3 in Eclipse? [message #1774078 is a reply to message #1410786] Tue, 10 October 2017 08:47 Go to previous messageGo to next message
Luis Figo is currently offline Luis FigoFriend
Messages: 1
Registered: October 2017
Junior Member
Is this bug fixed?
Re: Is it possible to use git merge.conflictstyle=diff3 in Eclipse? [message #1774523 is a reply to message #1774078] Mon, 16 October 2017 19:21 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1026
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: Fri Jun 22 05:59:07 GMT 2018

Powered by FUDForum. Page generated in 0.01422 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top