有没有这样在用的同学,给个参考,总是打不开前后两个版本的文件。
.gitconfig文件配置
[diff]
tool = bcompare
[difftool]
prompt = false
[merge]
tool = bcompare
[mergetool]
prompt = false
[difftool "bcompare"]
cmd = /usr/local/bin/bcompare diff -w \"$LOCAL\" \"$REMOTE\"
[mergetool "bcompare"]
cmd = /usr/local/bin/bcompare merge --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
.gitconfig文件配置
[diff]
tool = bcompare
[difftool]
prompt = false
[merge]
tool = bcompare
[mergetool]
prompt = false
[difftool "bcompare"]
cmd = /usr/local/bin/bcompare diff -w \"$LOCAL\" \"$REMOTE\"
[mergetool "bcompare"]
cmd = /usr/local/bin/bcompare merge --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot