Ruby China

Git 求推荐 OSX 下好用的 Git mergetool

lyfi2003 · November 21, 2012 · Last by hisea replied at December 12, 2012 · 4765 hits

如题，vimdiff 越用越想换，有无方便的工具。 任何回复，均表感谢。

mike #1 November 22, 2012

Mac 自带 File Merge

zw963 #2 November 22, 2012

只要是支持合并的代码比较工具，都可以支持 git, 具体如何设置，查看工具的文档。

jair #3 December 11, 2012

p4merge ～

xiaolai #4 December 11, 2012

我一直觉得 sourcetree 很好

You need to Sign in before reply, if you don't have an account, please Sign up first.