angus Posted September 15, 2015 Report Share Posted September 15, 2015 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 220.127.116.11 Link to comment Share on other sites More sharing options...
This topic is now archived and is closed to further replies.