2

当我尝试从 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

我能忘记什么?

4

0 回答 0