Questions tagged [araxis]

Araxis is a company that produces a commercial diff/merge tool for Windows and OS X.

In general, Araxis is a company providing four products:

  • Araxis Ketura
    A project management software

  • Araxis Find Duplicate Files (OS X only)
    Search tool for files with identical content

  • Araxis Replace In Files (OS X only)
    A search-and-replace tool for occurrences of strings in text files

  • Araxis Merge (Windows and OS X)
    A diff/merge tool for two- or three-way comparisons of different file types including visual comparison of images, text comparison of PDF and DOC files and more.

At SO however, the tag araxis is used as a synonym for araxis-merge.

18 questions
14
votes
8 answers

How to set Araxis as diff / merge tool for MSYS git?

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…
joce
  • 9,624
  • 19
  • 56
  • 74
8
votes
2 answers

Is there any way to save a patch/diff file in Araxis Merge?

I'm 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). Anyhow, the normal way I would do this would be to save to patch files and compare them to make sure the correct…
Doug T.
  • 64,223
  • 27
  • 138
  • 202
8
votes
1 answer

Integrating Araxis Merge 2010 with Visual Studio 2010 and TFS 2010

I'm trying to get Araxis Merge 2010 integration with Visual Studio working and am coming up against a brick wall with the arguments you should pass to Merge.exe. According to their documentation it arguments should be: /wait /swap /a3 /3 /title1:%6…
jonnii
  • 28,019
  • 8
  • 80
  • 108
6
votes
2 answers

POSIX file "." as alias causes "CFURLGetFSRef was passed this URL which has no scheme" warning

I am using applescripts supplied by Araxis so that I can use Merge to handle my 'git diff HEAD` command. However, ever since upgrading to Mountain Lion, each time I run the command, I receive the warning: CFURLGetFSRef was passed this URL which has…
sorens
  • 4,975
  • 3
  • 29
  • 52
4
votes
1 answer

How do I change the font size to zoom in and out in Araxis Merge on MacOS?

I went through all the settings and the Show Fonts panel and could not find any solution.
ubershmekel
  • 11,864
  • 10
  • 72
  • 89
4
votes
3 answers

araxis merge for mac and git diff

I'm trying to use command line git on os x in conjunction with araxis merge. I'd like git diff foo to open it araxis I've copied the utilties in the installer to /usr/bin $ cd /usr/bin/ $ ls | grep…
Jack Murphy
  • 2,952
  • 1
  • 30
  • 49
3
votes
0 answers

trustExitCode = false not working with Araxis merge for mac and Git

I have this in my config file: [merge] tool = araxismergetool trustExitCode = false [mergetool] keepBackup = false trustExitCode = false prompt = true [mergetool "araxismergetool"] trustExitCode =…
Clintm
  • 4,505
  • 3
  • 41
  • 54
2
votes
1 answer

Three-way diff from clipboard

I know Kdiff3 can do diff from clipboard but only 2-way. Is there a tool that allow me copy&paste three text and compare it? Now I have to create three files with the text I copied and compare them. After I delete them. Can't be online tool.
JrBenito
  • 973
  • 8
  • 30
2
votes
2 answers

using araxis merge for folder comparison on git branches (OSX)

I know how to setup araxis merge to be my git diff / merge tool, so if I do git difftool it automatically launches araxis merge. However if I do git difftool upstream/master (to see all the differences between current branch and upstream/master), it…
memo
  • 3,554
  • 4
  • 31
  • 36
2
votes
3 answers

How to compare JARs in Araxis Merge?

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…
AEIOU
  • 763
  • 3
  • 8
  • 15
2
votes
0 answers

Mac OsX: Git don't open Araxis on git mergetool command

When I try to do a merge from git I call git mergetool, but it doesn't open Araxis for merging. This is my ~/.gitconfig: [diff] tool = araxis [merge] tool = araxis And this is the result: $ git…
YoBre
  • 2,520
  • 5
  • 27
  • 37
1
vote
2 answers

Araxis merge doesn't show file names when merging

I have svn command-line client integrated with Araxis merge and I want to manually merge even when no conflicts discovered. When I run for example: so in my ~/.subversion/config file I set diff3 external editor: diff3-cmd =…
schatten
  • 1,497
  • 1
  • 12
  • 19
1
vote
1 answer

Automating a directory diff while ignoring some particular lines in files

I need to compare two directories, and produce some sort of structured output (text file is fine) of the differences. That is, the output might looks something like this: file1 exists only in directory2 file2 exists only in directory1 file3 is…
Adam S
  • 8,945
  • 17
  • 67
  • 103
1
vote
1 answer

Comparing versions with git and Araxis on Mac

I'm trying to use Araxis Merge to diff two branches of my git repo. When using git difftool, it opens each file one at a time (including a lot of libraries I don't need to worry about). When using hg, I get a nice folder view from the command…
John Nimis
  • 586
  • 3
  • 15
1
vote
1 answer

Araxis Merge doesn't respect .gitattributes preferences

I've added path/to/compiled/file.css -diff to my .gitattributes folder. git diff --no-ext-diff respects the preference and just lets me know the binary file was changed, but git diff (configured to use Araxis Merge as a gui diff) does not. When…
kayaker243
  • 2,580
  • 3
  • 22
  • 30
1
2