How to get Perforce Merge tool to work?

DevOps Unity Version Control
1

Hi,

I’m using the asset server and I can’t get perforce’s merge tool to work on Mac OS X, which is more odd to me given that in unity’s documentation it clearly says it supports it:
http://unity3d.com/support/documentation/Manual/Asset%20Server

Whenever the asset server needs assistance merging something, it pops up the dialog saying to accept changes and hit save before continuing in unity, it launches perforce’s merge tool, but no window appears, I just get the icon on the dock. I don’t get any errors on the console.

Is there a little trick I have to do, or is it just simply broken and nobody noticed it?

Regards,
Afonso

2

you use it with scripts, right?

Because anything but scripts can not be merged at all.

3

Of course :wink:

If I use FileMerger it works, but that app kind of sucks (eg doesn’t handle different EOLs correctly).

Regards,
Afonso

4

Hello? Any UT guys around? Is p4merge really supported or not?

Regards,
Afonso