News for hackers. Stuff that matters.

A comment on Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts. Parent comment

Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by cpeterso on Tuesday January 02, 2018 @08:33PM (#16057568)
Perforce's P4Merge is the least-worst (free) merge app I've found for Mac. I use it for git and hg. That said, I'm always open for recommendations for something better.
[ Parent | on HN ]
Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by cpeterso on Wednesday January 03, 2018 @02:05AM (#16059133)
btw, you can download P4Merge (aka "Helix Visual Merge Tool") here:

https://www.perforce.com/downloads/visual-merge-tool

[ Parent | on HN ]