![Araxis]( "Araxis")
本文介绍了如何将Araxis设置为MSYS git的差异/合并工具？的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！
问题描述
我正尝试使用作为MSYSGit的差异/合并工具。
我在网上发现了一些资源： =http://www.araxis.com/merge/scm_integration.html#Git =nofollow noreferrer> Araxis网站，他们提到一种简单的方式，但它暗示着一个可执行文件（araxisgitdiff。 exe文件和araxisgitmerge.exe），它们不属于我的发行版。
我还在，但实际的信息是：Araxis最好是稀少的，我不能做任何事情。 最后，有一些关于旧的，但建议的方法不适用于我。这个特别的信息是针对OS X的。我尽我所能翻译到Windows，但没有成功：我创建了
/bin/git-diff-driver.sh
＃！/ bin / sh
/ c / Program Files / Araxis / Araxis Merge / compare.exe-title1：$ 1（回购版）-title2：$ 1-max$ 2$ 5
并编辑 gitconfig
[合并]
工具= araxismerge
[mergetoolaraxismerge]
cmd =/ c / Program Files / Araxis / Araxis Merge / compare.exe-3 -merge -wait $ LOCAL $ BASE $ REMOTE $ MERGED
[diff]
external =/bin/git-diff-driver.sh
我得到的唯一结果是：
编辑：
我也尝试使用名为c：/ Program Files / Araxis / Araxis Merge / compare.exe如其中一个答案所示，结果相同。
编辑：
我发现它可以如果你使用TortoiseGit很容易设置，但它似乎自己处理差异，并且从命令行调用差异时，TortoiseGit没有设置任何关于如何将Araxis设置为合并工具的指示。
编辑：
所以问题是：Is有没有人成功地使用Araxis Merge来区分和合并MSYSGit的东西，如果是这样，你是怎么做到的？
你想让'git diff'总是使用araxis，你可以使用帮助文件中的指令，但是如果你想要控制使用'git diff'，就像你通常从命令行中使用'git difftool'来使用Araxis GUI。
尝试将以下内容添加到您的git config ::
<$ c $
path =/ c / Program Files / Araxis / Araxis Merge / compare.exe
renames = true
trustExitCode = true
[diff ]
tool = araxis
stat = true
[mergetoolaraxismergetool]
cmd ='C：\\ Program Files \\Araxis\\Araxis Merge \\araxisgitmerge.exe'$ REMOTE$ BASE$ PWD / $ LOCAL$ PWD / $ MERGED
tru stExitCode = false
[mergetool]
keepBackup = false
[合并]
工具= araxismergetool
stat = true
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 sparse at best, and I could not make anything out of that.
- Finally, there was some info on an older stackoverflow post, but the suggested method doesn't work for me. That particular info was geared towards OS X. I "translated" to Windows as best as I could, but without success:
I created /bin/git-diff-driver.sh
#!/bin/sh
"/c/Program Files/Araxis/Araxis Merge/compare.exe" -title1:"$1 (repo version)" -title2:"$1 " -max "$2" "$5"
and edited gitconfig
[merge]
tool = araxismerge
[mergetool "araxismerge"]
cmd = "/c/Program Files/Araxis/Araxis Merge/compare.exe" -3 -merge -wait $LOCAL $BASE $REMOTE $MERGED
[diff]
external = "/bin/git-diff-driver.sh"
and the only result I get is:
Edit:
I've also tried with the exe named as "c:/Program Files/Araxis/Araxis Merge/compare.exe" as suggested by one of the answers, with the same results.
Edit:
I've found that it can easily be set if you use TortoiseGit, but it seems to handle diff by itself and no settings from TortoiseGit give any indication on how to set up Araxis as a merge tool when diff is invoked from the command line.
Edit:
So, the question is: Is there anybody who successfully uses Araxis Merge to diff and merge stuff with MSYSGit, and if so, how do you it?
解决方案
If you want to have 'git diff' always use araxis you can use the instructions in the help file, but if you want to have control to use 'git diff' as you normally would from the command line and 'git difftool' to engage the Araxis GUI.
Try adding the following to your git config::
[difftool "araxis"]
path = "/c/Program Files/Araxis/Araxis Merge/compare.exe"
renames = true
trustExitCode = true
[diff]
tool = araxis
stat = true
[mergetool "araxismergetool"]
cmd = 'C:\\Program Files\\Araxis\\Araxis Merge\\araxisgitmerge.exe' "$REMOTE" "$BASE" "$PWD/$LOCAL" "$PWD/$MERGED"
trustExitCode = false
[mergetool]
keepBackup = false
[merge]
tool = araxismergetool
stat = true
这篇关于如何将Araxis设置为MSYS git的差异/合并工具？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！