3 ms·
I've been using FileMerge "forever". It comes bundled with XCode and can be used in git as "opendiff".
by johncoltrane 10y ago
I've been using FileMerge "forever". It comes bundled with XCode and can be used in git as "opendiff".
- drakenot 10y agoI'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.