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.

Reply via email to