I’m an ediff fan, but was using meld for a long time. It’s not that hard :)
If running :mergetool is OK, maybe all you need is a command for mergetool. Probably with a dialog where you can select the actual tool. On Sat, Nov 19, 2016, 17:20 Kyle Meyer <[email protected]> wrote: > Noam Postavsky <[email protected]> writes: > > [...] > > > There's no special support in Magit for external tools (Real Emacsers > > use ediff ;) ). > > No, smerge is all you need :) > > -- > Kyle > > -- > You received this message because you are subscribed to the Google Groups > "magit" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
