前言:在.git文件中含有一个config文件,这个文件中包含了git的配置信息
文件配置信息:
[diff] tool = bc4 [difftool] prompt = false [difftool "bc4"] cmd = ""D:\Program Files\Beyond Compare 4\BCompare.exe" "$LOCAL" "$REMOTE"" [merge] tool = bc4 [mergetool] prompt = false [mergetool "bc4"] cmd = ""D:\Program Files\Beyond Compare 4\BCompare.exe" "$LOCAL" "$REMOTE" "$BASE" "$MERGED""
使用:
文件对比:
git difftool <filename>
文件合并:
git mergetool