I miss FileMerge.app
0 Boosts
0 Likes
Meld is like. *Okay*. Like it's okay. Barely. And I'm always a little afraid I'm going to Hold It Wrong and lose data. And I don't actually know how to wire it for use with git
My solution for years to every git problem was "I will become fantastically proficient with Mercurial, and when I need to do something weird I'll clone into Mercurial and do the work there". And then git-lfs happened and suddenly I was using a mix of Mercurial and git and my plan did not work anymore
I should write vimdiff but nano