在Mac OS上使用kdiff3作为默认的git diff查看器


1

我的Mac(版本0.9.97,64位)上安装了kdiff3。这是我的〜/ .gitconfig:

[filter "media"]
    required = true
    clean = git media clean %f
    smudge = git media smudge %f
[user]
    name = My Name
    email = me@example.com

[core]
    editor = atom --wait
[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
[diff]
    tool = kdiff3
[difftool "kdiff3"]
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3

一切似乎都很好,但是当我这样做的时候git diff,我看到了控制台diff的输出。关于如何解决这个问题的任何想法?


是否可以更新您的Git并改用git difftooldocs)?
onik

Answers:


1

不要使用

git diff myfile.txt

git difftool myfile.txt

By using our site, you acknowledge that you have read and understand our Cookie Policy and Privacy Policy.
Licensed under cc by-sa 3.0 with attribution required.