摘要：
在windows上就选Beyond Compare来作比较和合并工具吧。 Beyond Compare官方给出来多个版本工具的配置方案。 http://www.scootersoftware.com/support.php?c=kb_vcs.php Git for Windows Note: If you use the Git for Windows' Bash Command Prompt instead of the default Windows Command Prompt, you need to escape the $ character with *\$*. Diff 阅读全文