[egit-dev] Fwd: Should I be able to Merge content when Synchronizing?

[Manuel Doninger <manuel@xxxxxxxxxxxx>]

Forgot the list.

---------- Forwarded message ----------
From: Manuel Doninger <manuel@xxxxxxxxxxxx>
Date: Tue, Apr 5, 2011 at 23:38
Subject: Re: [egit-dev] Should I be able to Merge content when Synchronizing?
To: Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx>


On Tue, Apr 5, 2011 at 23:33, Matthias Sohn
<matthias.sohn@xxxxxxxxxxxxxx> wrote:
> 2011/4/5 Manuel Doninger <manuel@xxxxxxxxxxxx>
>>
>> If you right-click on a conflicted resource, there is a mergetool
>> entry in the Team submenu.
>>
> yeah, but you can't hook in a custom merge tool yet
>
>>

I resolved that with an Externals Tools Run Configuration, to start
TortoiseMerge on the current selected project. I don't know the exact
execution string, but i can look tomorrow at work.

Manuel