How do I get araxis merge to work as a git difftool
I've been trying to setup araxis as git difftool, but it never works.
I looked at this thread but it is incomplete:
How do I configure Araxis Merge for use with Git?
here is part of my global config.
[difftool "araxis"]
path = "C:/Program Files/Araxis/Araxis Merge/Merge.exe"
[diff]
tool = araxis
[core]
autocrlf = true
excludesfile = C:\\Users\\gmmo\\Documents\\gitignore_global.txt
[difftool]
prompt = false
but when I have some unstaged changes and issue "git difftool" I get this:
If anyone has some hints, I greatly appreciate!
thx!
Solution
Totally bad and wrong definition in [difftool]
I don't have Git+Araxis, but Araxis docs recommends in "Integrating with Source Control, Configuration Management and Other Applications" chapter's topic Git for Windows (msysGit)
[diff]
tool = araxis
[difftool "araxis"]
path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe
note:
- filename of differ
- double backlsashes for separating path-elements
- Rename file for all commits in a Git repository
- git pull and resolve conflicts
- How to substitute text from files in git history?
- Define git alias with the same name to shadow original command
- Specify extras_require with pip install -e
- How do I rebase my PR without adding commits to it?
- Merge git repo into branch of another repo
- How to correct `git` reporting `detected dubious ownership in repository` without adding `safe.directory` when using WSL?
- Trouble setting up git with my GitHub Account error: could not lock config file
- In a Git repository, how to properly rename a directory?
- Git submodule push
- send-pack: unexpected disconnect while reading sideband packet when pushing to local git server
- Gerrit: configure similarity index threshold (renamed file)
- Git double revert : How to keep original author?
- Gitignore not working
- git submodule deinit not working as expected after submodule url change
- How can I find/identify large commits in Git history?
- How to fix : failed to push some refs to gitlab?
- Gitlab: webhook event on create branch
- Using "x AND y" instead of "x OR y" when using --grep twice in git-log
- Issues with commit message when pre-commit hook changes files
- Unstaged changes left after git reset --hard
- How to clone only a folder from a git submodule?
- How do I checkout a branch ignoring all local changes?
- Include only tracked files with npm publish
- Prevent Pull Request builds from triggering Continuous deployment trigger Azure DevOps Server
- Heroku/Git: protocol error: bad line length character: erro
- Add all files to a commit except a single file?
- Git Bash is extremely slow on Windows 7 x64
- How to delete a git working tree branch when its working directory has been removed?