On Sat, Nov 19, 2016 at 5:14 PM, Noam Postavsky <[email protected]> wrote: > On Sat, Nov 19, 2016 at 10:25 AM, Martin Geisler <[email protected]> wrote: >> >> The only times were I have to drop back to a terminal and raw Git >> commands is when I have merge conflicts. I then run "git mergetool" in >> my terminal to have KDiff3 start on the files in question. >> >> I haven't found a way to run an external mergetool from within Magit. >> The manual page about conflicts doesn't mention anything about >> external tools: https://magit.vc/manual/magit/Resolving-conflicts.html >> >> Is there a keybinding I'm missing? >> > > Maybe `M-!' ;)
Yeah, that would work :-D > There's no special support in Magit for external tools (Real Emacsers > use ediff ;) ). Perhaps you could try putting something into > ~/.gitconfig I already have KDiff3 configured as the default mergetool, so 'git mergetool' is all I need to run to start the process. A Magit interface for that could be very light-weight -- I guess it would simply involve letting the user run the mergetool on some or all files with conflicts. -- Martin Geisler -- 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.
