Mac OsX:Git不会在git mergetool命令上打开Araxis

时间:2013-12-12 17:04:05

标签: git git-merge mergetool araxis

当我尝试从git进行合并时,我会调用git mergetool,但它不会打开Araxis进行合并。

这是我的~/.gitconfig

[diff]
  tool = araxis

[merge]
  tool = araxis

这就是结果:

$ git mergetool
Merging:
src/main/webapp/css/style.css

Normal merge conflict for 'src/main/webapp/css/style.css':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (araxis):
src/main/webapp/css/style.css seems unchanged.
Was the merge successful? [y/n] n
merge of src/main/webapp/css/style.css failed

我有什么可以忘记的?

0 个答案:

没有答案