git difftool -d` get'file does not exist'在mac上出错

问题描述

我试图使用命令 git difftool -d 作为文件夹diff。

命令get diff列表成功（在FileMerge.app中显示）。但是当我尝试打开每个diff文件。
$ b

输出日志： b'pre> $ GIT中difftool -d
合并工具候选：了opendiff kdiff3 tkdiff xxdiff MELD kompare gvimdiff漫ecmerge p4merge araxis BC3 codecompare出现vimdiff同时


图片：

我在mac OS X 10.9上使用git 1.8.1.1。
Thanks。

解决方案

问题是opendiff命令返回导致difftool删除临时目录和所有文件你在比较。经过大量搜索，我发现这一点，基本上你必须保持opendiff运行，直到FileMerge退出。
将您的git配置更改为：

  [diff] 
工具= opendiff 
 [difftool ] 
 prompt = false 
 [difftoolopendiff] 
 cmd = / usr / bin / opendiff \$ LOCAL \\$ REMOTE\-merge \ $ MERGED \| cat 
  

在这里找到了答案：

I am trying to use command git difftool -d for a folder diff.

The command get diff list successfully (show in FileMerge.app). But when I try to open each diff file. I get file does not exist error.

Output log:

$ git difftool -d
merge tool candidates: opendiff kdiff3 tkdiff xxdiff meld kompare gvimdiff diffuse ecmerge p4merge araxis bc3 codecompare emerge vimdiff

Image:

I am using git version 1.8.1.1 on mac OS X 10.9.Thanks.

解决方案

The problem is the opendiff command returns which causes difftool to delete the temp directory and all the files you are comparing. After a ton of searching I found this, basically you have to keep that opendiff running until FileMerge exits.change your git config to:

[diff]
    tool = opendiff
[difftool]
    prompt = false
[difftool "opendiff"]
    cmd = /usr/bin/opendiff \"$LOCAL\" \"$REMOTE\" -merge \"$MERGED\" | cat

found the answer here:https://gist.github.com/bkeating/329690

这篇关于git difftool -d` get'file does not exist'在mac上出错的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！