Jump to content
angus

XMerge on OS X?

Recommended Posts

Is XMerge available on OS X? I've set up SemanticMerge to be my git mergetool. Previously when I was using windows and had SemanticMerge try to resolve a conflict in a groovy file, it popped up and told me groovy wasn't a supported language, but allowed me to use XMerge. XMerge worked wonderfully. Now when I just tried to do the same thing on OS X, it popped up and said groovy wasn't a supported language and then "no external merge tool has been specified in order to proceed with the merge". I also don't see any XMerge binary in the .app bundle

 

versions:

OS X 10.10.5

git 2.5.1

semanticmerge 1.0.77.0

 

Share this post


Link to post
Share on other sites

Hello angus,

 

I think you need to configure (inside semanticmerge) a tool to be able to merge groovy files. That would be enough.

 

Tel me if it works.

Share this post


Link to post
Share on other sites

Hi manu. I know I could configure an external merge tool such as kdiff and then it would work. But I specifically want to use Xmerge. On the front page of semanticmerge.com it says 

SemanticMerge includes the text-based Xdiff and Xmerge tools that are able to deal with refactored code at a text level and hence, become the perfect companion for the structural merge provided by SemanticMerge.

Xmerge worked very well for me when I was using windows. I can't figure out how I would configure Xmerge now on OSX, because I don't see anything in the semanticmerge.app bundle that looks like Xmerge or Xdiff executables

Share this post


Link to post
Share on other sites

Hey Angus,

 

We don't have Xmerge support on Mac yet, unfortunately.

 

We're working on implementing a Cocoa based Xdiff right now on Mac, and merge will come next.

 

Today we were coding the new diff on Mac (starting the task today), so it will still take some time ... but we're on it.

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now

×