Using p4merge as git diff tool

后端 未结 2 2108
谎友^
谎友^ 2021-02-15 10:30

I use windows 7. I want to use p4merge as Git diff/merge tool. I follow this article and this one to setup and config p4merge:

<         


        
2条回答
  •  一生所求
    2021-02-15 11:06

    Better late than never :)

    mergetool.p4merge.path should be mergetool.p4merge.cmd

    Change path to cmd for both the mergetool and difftool lines.

提交回复
热议问题