[I accidentally dropped the list in the reply. Resending.] Martin Geisler <[email protected]> writes:
[...] > 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? No, I don't think there's currently a command or keybinding for "git mergetool", though running ":mergetool" is a bit shorter than switching to a shell. I suspect that most Magit users rely on some combination of smerge and ediff (magit-ediff-resolve) to resolve conflicts within Emacs, but I don't know. It may be worth mentioning git-mergetool here: https://github.com/magit/magit/issues/2849. -- 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.
