| |
svn与bc3协同工作
建议配置在~/.subversion/config中,替换diff_cmd与merge_tool_cmd
git 与bc3 协同工作配置方法
Linux下
[diff]
tool = bc3
[difftool]
prompt = false
[merge]
tool = bc3
[mergetool]
prompt = false
cygwin下
[diff]
tool = jellybc3
[difftool]
prompt = false
[difftool "jellybc3"]
#use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software
cmd = \"/cygdrive/c/program files/beyond compare 3/bcomp.exe\" \"$(cygpath -w $LOCAL)\" \"$REMOTE\"[merge] tool = jellybc3
[mergetool]
prompt = false
[mergetool "jellybc3"]
#trustExitCode = true
cmd = \"/cygdrive/c/program files/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" \"$MERGED\"
使用方法查看diff
使用bc解决冲突
参考资料