Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [egit-dev] Merge Tool does not work for conflicts while cherry-picking

Silvio Heuberger wrote:
> Contrary to what is said here:
> 
> http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.10#Merge_Tool
> 
> I found that in the nightly build version, the "Merge Tool" Menu entry
> is disabled, when I select a file that has conflicts while I
> cherry-pick.

It's a known bug, see here:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=339092

-- 
  Robin


Back to the top