Help us understand the problem. What is going on with this article?

VimDiff for MacVim を設定してわかった事

More than 3 years have passed since last update.

MacでVimDiffを使ってみようといろいろ調べた結果を共有します。

結論

普通にvimdiffを起動するとデフォルトのvimdiffが起動するので、適時設定を変更する必要があります。
MacVimの設定をしたから大丈夫と考えていたため、意外な盲点でした。

設定例

cmdの設定をしなくてもvimdiffは機能しますが、ターミナル上ではsyntax highlightがうまく機能せず、それ以外にも問題があったので、MacでVimDiff使っている方は設定した方が幸せになれると思います。

.bash_profile
alias vimdiff='/Applications/MacVim.app/Contents/MacOS/vimdiff'
.gitconfig
[diff]
    algorithm = histogram
    tool      = vimdiff
[difftool "vimdiff"]
    cmd = /Applications/MacVim.app/Contents/MacOS/vimdiff $LOCAL $REMOTE

※ブログからの転載です。

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
Comments
Sign up for free and join this conversation.
If you already have a Qiita account
Why do not you register as a user and use Qiita more conveniently?
You need to log in to use this function. Qiita can be used more conveniently after logging in.
You seem to be reading articles frequently this month. Qiita can be used more conveniently after logging in.
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away