Re:Ask HN: What's your favorite diff merge tool on macOS?
by johncoltrane on Thursday November 17, 2016 @09:04AM
(#12977494)
I've been using FileMerge "forever". It comes bundled with XCode and can be used in git as "opendiff".
[ Parent
| on HN ]
Re:Ask HN: What's your favorite diff merge tool on macOS?
by drakenot on Thursday November 17, 2016 @09:35AM
(#12977739)
I've used the same. One thing that is odd is the "merge" window that shows the final result of the merge that sits below the left and right pane is set to 0 height by default. I've surprised several colleagues by moving my mouse to their bottom pane of FileMerge and dragging up showing them that 3rd pane.