On Wednesday, December 7, 2016 at 7:13:22 AM UTC-6, Edward K. Ream wrote: > > Leo already supports --diff command line option: - h reports: > > --diff use Leo as an external git diff > > Apparently this was not up to snuff. Or maybe I just forgot about it... >
The present code is in LM.doDiff. It appears to be more of a stub than an attempt at complete code. The next sections provide haiku designs for using Leo as a git diff/merge design... *Diff* 1. All diffed files open immediately in a *single* Leo outline. No tabs. 2. Diffed files will be grouped by folder. 3. Each diffed file will be represented by a single node, with two or more children giving the details of the diff. *Merge* An outline-oriented merge will be so useful. Merging files would open Leo much as for diff. However, some way of indicating which code to use is essential. The ideal would be the ability to cherry pick from within Leo. We'll see. *Summary* Using Leo for git diff and merge will make collaboration between Leonistas much easier. This is an extremely important project! How did I not see this before? Edward P.S. Supporting diff and merge in Leo should be relatively straightforward. Indeed, a few minutes of googling has already solved several git-related problems: 1. How to make git diff write to stdout? <http://stackoverflow.com/questions/17077973/how-to-make-git-diff-write-to-stdout> 2. git difftool, open all diff files immediately, not in serial <http://stackoverflow.com/questions/1220309/git-difftool-open-all-diff-files-immediately-not-in-serial> As a result, I expect progress on this project to be swift. 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.
