3 ms·
For 3-way merging the best tool I've found is Steve Losh's splice.vim (https://github.com/sjl/splice.vim/ https://github.com/sjl/splice.vim/).
by eridius 9y ago
For 3-way merging the best tool I've found is Steve Losh's splice.vim (https://github.com/sjl/splice.vim/ https://github.com/sjl/splice.vim/).
- babuskov 9y agoMy favorite tool is Meld: http://meldmerge.org/ http://meldmerge.org/ It's open source. Also: https://stackoverflow.com/questions/572237/whats-the-best-three-way-merge-tool https://stackoverflow.com/questions/572237/whats-the-best-th...
- 72deluxe 9y agoYes back when using Linux, I used Meld a lot. I can recommend it - the directory comparison is good. Also KDiff3. Struggling to remember the other ones I used to try unfortunately.