Quantcast
Channel: The Fugue » merge
Browsing latest articles
Browse All 2 View Live

Why vimdiff?

I love Vim and vimdiff, but vimdiff is pitiful for doing 3-way merges. So I wonder why git's search for a merge tool prefers vimdiff over opendiff (which launches OS X's fantastic FileMerge program)....

View Article



Terminal Merge Conflict Resolution

A very important tool in the toolbox of any collaborating developer is a merge conflict resolution tool. OS X has the fantastic FileMerge, there are various graphical tools for linux like kdiff3, but I...

View Article
Browsing latest articles
Browse All 2 View Live




Latest Images