1. SourceTree 在用

    Sourcetree | Free Git GUI for Mac and Windows

  2. Sublime Merge

    Sublime Merge - Git client from the makers of Sublime Text

    macWk：https://www.macwk.com/soft/sublime-merge