Why doesn't `git diff` invoke external diff tool?

前端 未结 3 1888
执笔经年
执笔经年 2021-02-02 08:22

In my repository, if I type

$ git diff some-file

or

$ git difftool some-file

I get the in-terminal diff displ

3条回答
  •  隐瞒了意图╮
    2021-02-02 08:40

    It seems that git diff (at least, as of git version 1.7.12.4) will not run anything other than the internal, console-only diff on a file which is in the "both modified" state. git mergetool works on such files, though.

提交回复
热议问题