Git Diff with Beyond Compare

前端 未结 17 2108
醉酒成梦
醉酒成梦 2020-11-30 16:39

I have succeeded in getting git to start Beyond Compare 3 as a diff tool however, when I do a diff, the file I am comparing against is not being loaded. Only the latest ver

17条回答
  •  孤城傲影
    2020-11-30 17:18

    Here is my config file. It took some wrestling but now it is working. I am using windows server, msysgit and beyond compare 3 (apparently an x86 version). Youll notice that I dont need to specify any arguments, and I use "path" instead of "cmd".

    [user]
            name = PeteW
            email = petew@petew.com
    [diff]
            tool = bc3
    [difftool]
            prompt = false
    [difftool "bc3"]
            path = /c/Program Files (x86)/Beyond Compare 3/BComp.exe
    [merge]
            tool = bc3
    [mergetool]
            prompt = false
            keepBackup = false
    [mergetool "bc3"]
            path = /c/Program Files (x86)/Beyond Compare 3/BComp.exe
            trustExitCode = true
    [alias]
            dt = difftool
            mt = mergetool
    

提交回复
热议问题