I'm trying to use Araxis Merge as my diff / merge tool for MSYSGit. I found a few resources on the net: On the Araxis site, they mention an "easy" way, but it implies a executables (araxisgitdiff.exe and araxisgitmerge.exe) that are not part of my distro. I also found some info in gitguru, but the actual information re: Araxis is spar...
I am merging some code and would like to save one diff to compare against another diff. (I'm in the dreaded diff-the-diff's scenario). Anywho, the normal way I would do this would be to save to patch files and compare them to make sure the correct changes were applied. Is there anyway to get Araxis to generate a patch file for a diff I'...
I'm using Araxis Merge to try and compare two java archive files. I've done it in Beyond Compare but have recently switched to a mac. Right now Araxis treats the jars like files and i just see a lot of binary/hex stuff, I'd like to see which classes have differences and to treat the jar like a folder. Any ideas? ...
Hey, I often hit this problem: I have to merge a svn branch into trunk. The branch is old, and has seen a lot of changes that were manually copied from one branch to the other. svn:merge info is not present. Araxis almost makes my life easy. I make a checkout of trunk, a checkout of my branch, and a checkout of my branch at the revisi...