Git Diff with Beyond Compare

前端 未结 17 2078
醉酒成梦
醉酒成梦 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:11

    Thanks to @dahlbyk, the author of Posh-Git, for posting his config as a gist. It helped me resolve my configuration issue.

    [diff]
        tool = bc3
    [difftool]
        prompt = false
    [difftool "bc3"]
        cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
    [merge]
        tool = bc3
    [mergetool]
        prompt = false
        keepBackup = false
    [mergetool "bc3"]
        cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
        trustExitCode = true
    [alias]
        dt = difftool
        mt = mergetool
    

提交回复
热议问题