Check out Meld (http://meldmerge.org/) as well, it's pretty good. Side by side text view. Cheers -Terry From: Edward K. Ream <[email protected]> To: leo-editor <[email protected]> Sent: Wednesday, December 7, 2016 10:33 AM Subject: Re: --diff: Leo as an external git diff On Wednesday, December 7, 2016 at 10:12:39 AM UTC-6, Edward K. Ream wrote:
> Merge...The ideal would be the ability to cherry pick from within Leo. A way must be found. This is way too good to miss! SourceTree has superb cherry-picking abilities. I switched from SourceTree to gitk because SourceTree had severe performance bugs. Maybe they have been fixed... SourceTree presents diffs as a series of separate snippets. For each snippet, you could choose whether to use the old or new version of the code. You just press a button. SourceTree may do something similar for merges. Clearly, Leo can do at least as well, without performance problems! Indeed, Leo can diff huge files instantly because each node has a unique gnx. Thus moves can be detected without effort, and O(N**2) diff algorithms work on smallish text, namely p.b. Outlines are the ultimate platform for diffs and merges! Eventually, we may want a SourceTree-like interface for cherry-picking. But that might not be necessary. We can imagine a command like git-pick (applied to the desired code) or git-pick-mine, applied to an organizer node containing two or three variants of code. Or maybe something even simpler :-) It's hard to overstate how important this could be. Heh. Imagine non-Leonistas using Leo as the ultimate git diff/merge tool! EKR -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
