Haven't tried Meld and i'm always up for an enhanced workflow but merge/diff is all about context, the more context you can add about where something came from / is going to, its history etc the better. In this regard it is almost impossible (never say never) to beat your IDE for the possibility of a good merge/diff, it has all the context plus syntax highlighting, compiler errors / build scripts etc. I can merge two files, plus git blame where the changes came from, plus syntax highlight and see likely compile errors, remove unused imports and apply consistent formatting all in one step.<p>This is why I always use IntelliJ merge/diff for supported languages, it just has so much more information about the merge/diff already available.